diff --git a/lib/classes/patch/320f.php b/lib/classes/patch/320f.php
index b520ececf0..1a17b874a8 100644
--- a/lib/classes/patch/320f.php
+++ b/lib/classes/patch/320f.php
@@ -83,6 +83,7 @@ class patch_320f implements patchInterface
         $date_ref = new DateTime();
         $n = 0;
 
+        $app['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener());
         foreach ($rs as $row) {
             $user = User_Adapter::getInstance($row['usr_id'], $app);
 
@@ -152,6 +153,8 @@ class patch_320f implements patchInterface
         $app['EM']->flush();
         $app['EM']->clear();
 
+        $app['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener());
+
         return true;
     }
 
diff --git a/lib/classes/patch/3907.php b/lib/classes/patch/3907.php
index 96701bf655..e1c972a01e 100644
--- a/lib/classes/patch/3907.php
+++ b/lib/classes/patch/3907.php
@@ -152,6 +152,11 @@ class patch_3907 implements patchInterface
             }
         }
 
+        $fiStmt->closeCursor();
+        $feStmt->closeCursor();
+        $fpStmt->closeCursor();
+        $ftStmt->closeCursor();
+
         $faStmt->execute();
         $faRes = $faStmt->fetchAll(\PDO::FETCH_ASSOC);
 
@@ -163,6 +168,7 @@ class patch_3907 implements patchInterface
 
             $em->persist($token);
         }
+        $faStmt->closeCursor();
 
         $em->flush();
         $em->clear();