diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 9a8e51468..21f8c61f3 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -17,7 +17,7 @@ class EventsController extends AppController {
 
     public $components = array('Security', 'Email');
     public $paginate = array(
-        'limit' => 50,
+        'limit' => 60,
         'order' => array(
             'Event.date' => 'DESC'
         )
diff --git a/app/Controller/SignaturesController.php b/app/Controller/SignaturesController.php
index 6d05139a0..23116f86d 100644
--- a/app/Controller/SignaturesController.php
+++ b/app/Controller/SignaturesController.php
@@ -11,6 +11,9 @@ App::uses('File', 'Utility');
 class SignaturesController extends AppController {
 
     public $components = array('Security');
+    public $paginate = array(
+            'limit' => 60,
+    );
 
     function beforeFilter() {
         // permit reuse of CSRF tokens on the search page.
diff --git a/app/Model/Signature.php b/app/Model/Signature.php
index 92215f79a..e0b393b29 100644
--- a/app/Model/Signature.php
+++ b/app/Model/Signature.php
@@ -166,6 +166,7 @@ class Signature extends AppModel {
 
 	function beforeDelete() {
 	    // delete attachments from the disk
+	    $this->read();  // first read the signature from the db
 	    if('attachment' == $this->data['Signature']['type'] ||
 	       'malware-sample'== $this->data['Signature']['type'] ) {
 	        // FIXME secure this filesystem access/delete by not allowing to change directories or go outside of the directory container.