diff --git a/server/apimodels/__init__.py b/server/apimodels/__init__.py
index 2406f7f..eb295cc 100644
--- a/server/apimodels/__init__.py
+++ b/server/apimodels/__init__.py
@@ -155,7 +155,7 @@ class EnumField(fields.StringField):
 class ActualEnumField(fields.StringField):
     @property
     def types(self):
-        return (self.__enum,)
+        return self.__enum,
 
     def __init__(
         self,
diff --git a/server/schema/services/events.conf b/server/schema/services/events.conf
index fbf56b2..ffd363c 100644
--- a/server/schema/services/events.conf
+++ b/server/schema/services/events.conf
@@ -455,7 +455,7 @@
                     }
                     batch_size {
                         type: integer
-                        description: "Number of events to return each time"
+                        description: "Number of events to return each time (default 500)"
                     }
                     event_type {
                         type: string
diff --git a/server/services/tasks.py b/server/services/tasks.py
index 53b15b3..e93db64 100644
--- a/server/services/tasks.py
+++ b/server/services/tasks.py
@@ -726,7 +726,7 @@ def cleanup_task(task, force=False):
     else:
         updated_models = 0
 
-    event_bll.delete_task_events(task.company, task.id)
+    event_bll.delete_task_events(task.company, task.id, allow_locked=force)
 
     return CleanupResult(
         deleted_models=deleted_models,
diff --git a/server/tests/requirements.txt b/server/tests/requirements.txt
index 6d831c0..f930506 100644
--- a/server/tests/requirements.txt
+++ b/server/tests/requirements.txt
@@ -1 +1,2 @@
 numpy>=1.12.1
+nose==1.3.7