diff --git a/apps/dav/lib/Migration/Version1004Date20170825134824.php b/apps/dav/lib/Migration/Version1004Date20170825134824.php
index 81107a7c75..d25e387e32 100644
--- a/apps/dav/lib/Migration/Version1004Date20170825134824.php
+++ b/apps/dav/lib/Migration/Version1004Date20170825134824.php
@@ -369,6 +369,7 @@ class Version1004Date20170825134824 extends SimpleMigrationStep {
 				'unsigned' => true,
 			]);
 			$table->setPrimaryKey(['id']);
+			$table->addIndex(['principaluri'], 'schedulobj_principuri_index');
 		}
 
 		if (!$schema->hasTable('cards_properties')) {
diff --git a/apps/dav/lib/Migration/Version1006Date20180628111625.php b/apps/dav/lib/Migration/Version1006Date20180628111625.php
index a09bb070d8..08a5951d8d 100644
--- a/apps/dav/lib/Migration/Version1006Date20180628111625.php
+++ b/apps/dav/lib/Migration/Version1006Date20180628111625.php
@@ -92,6 +92,7 @@ class Version1006Date20180628111625 extends SimpleMigrationStep {
 			$calendarObjectsPropsTable->addIndex(['objectid', 'calendartype'], 'calendarobject_index');
 			$calendarObjectsPropsTable->addIndex(['name', 'calendartype'], 'calendarobject_name_index');
 			$calendarObjectsPropsTable->addIndex(['value', 'calendartype'], 'calendarobject_value_index');
+			$calendarObjectsPropsTable->addIndex(['calendarid', 'calendartype'], 'calendarobject_calid_index');
 		}
 
 		if ($schema->hasTable('calendarsubscriptions')) {
diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php
index 757697e7e9..4df2f4cbda 100644
--- a/core/Migrations/Version13000Date20170718121200.php
+++ b/core/Migrations/Version13000Date20170718121200.php
@@ -94,11 +94,13 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 				'notnull' => true,
 				'length' => 4,
 			]);
-			$table->addColumn('storage_id', 'integer', [
+			$table->addColumn('storage_id', Type::BIGINT, [
 				'notnull' => true,
+				'length' => 20,
 			]);
-			$table->addColumn('root_id', 'integer', [
+			$table->addColumn('root_id', Type::BIGINT, [
 				'notnull' => true,
+				'length' => 20,
 			]);
 			$table->addColumn('user_id', 'string', [
 				'notnull' => true,
@@ -108,8 +110,9 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 				'notnull' => true,
 				'length' => 4000,
 			]);
-			$table->addColumn('mount_id', 'integer', [
+			$table->addColumn('mount_id', Type::BIGINT, [
 				'notnull' => false,
+				'length' => 20,
 			]);
 			$table->setPrimaryKey(['id']);
 			$table->addIndex(['user_id'], 'mounts_user_index');