diff --git a/composer.json b/composer.json
index 92d3cc7..5a006e5 100644
--- a/composer.json
+++ b/composer.json
@@ -21,13 +21,11 @@
     "require": {
         "php": ">=5.3",
         "doctrine/orm": "2.*",
-	"zendframework/zendframework1" : ">=1.11.11"
+	"zendframework/zendframework1" : "*"
     },
     
     "autoload":     {
         "psr-0": {
-            "doctrine/doctrine2" : "lib/",
-            "zendframework/zendframework1" : "library/",
             "Pike_" : "lib/"
         }
     },
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 08e31cb..0000000
--- a/composer.lock
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "hash": "96e65e511759d4647b91bf8018b7abce",
-    "packages": [
-        {
-            "package": "doctrine/common",
-            "version": "2.2.2"
-        },
-        {
-            "package": "doctrine/dbal",
-            "version": "2.2.2"
-        },
-        {
-            "package": "doctrine/orm",
-            "version": "2.2.2"
-        },
-        {
-            "package": "zendframework/zendframework1",
-            "version": "1.11.12"
-        }
-    ],
-    "packages-dev": null,
-    "aliases": [
-
-    ],
-    "minimum-stability": "stable",
-    "stability-flags": [
-
-    ]
-}
diff --git a/lib/Pike/Session/SaveHandler/Doctrine.php b/lib/Pike/Session/SaveHandler/Doctrine.php
index 2a5b7e6..6fbab31 100644
--- a/lib/Pike/Session/SaveHandler/Doctrine.php
+++ b/lib/Pike/Session/SaveHandler/Doctrine.php
@@ -161,7 +161,7 @@ public function read($id)
                 $return = $entity->getData();
             } else {
                 self::$em->remove($entity);
-                self::$em->flush();
+                self::$em->flush($entity);
             }
         }
 
@@ -186,7 +186,7 @@ public function write($id, $data)
         $entity->setModified(new DateTime('now'));
 
         self::$em->persist($entity);
-        self::$em->flush();
+        self::$em->flush($entity);
 
         return true;
     }
@@ -203,7 +203,7 @@ public function destroy($id)
 
         if ($entity instanceof Pike_Session_Entity_Interface) {
             self::$em->remove($entity);
-            self::$em->flush();
+            self::$em->flush($entity);
 
             return true;
         }
@@ -232,4 +232,4 @@ public function gc($maxlifetime)
 
         return true;
     }
-}
\ No newline at end of file
+}