diff --git a/lib/Migration/Version000009Date20190625000800.php b/lib/Migration/Version000009Date20190625000800.php
index cd1e75d29..4565efa98 100644
--- a/lib/Migration/Version000009Date20190625000800.php
+++ b/lib/Migration/Version000009Date20190625000800.php
@@ -42,12 +42,10 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$table->addColumn('adr', 'string', [
 				'notnull' => true,
 				'length' => 255,
-				'unique' => true,
 			]);
 			$table->addColumn('adr_norm', 'string', [
 				'notnull' => true,
 				'length' => 255,
-				'unique' => true,
 			]);
 			$table->addColumn('lat', 'float', [
 				'notnull' => false,
diff --git a/lib/Migration/Version000012Date20190722184716.php b/lib/Migration/Version000012Date20190722184716.php
index e28ac6da4..8b5d64be8 100644
--- a/lib/Migration/Version000012Date20190722184716.php
+++ b/lib/Migration/Version000012Date20190722184716.php
@@ -46,11 +46,6 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 				'notnull' => true,
 				'length' => 41,
 			]);
-			$table->addColumn('contact_uid', 'string', [
-				'notnull' => true,
-				'default' => '',
-				'length' => 64,
-			]);
 			$table->addColumn('adr', 'string', [
 				'notnull' => true,
 				'default' => '',
@@ -75,7 +70,6 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$table->setPrimaryKey(['id']);
 			$table->addIndex(['adr'], 'maps_adr');
 			$table->addIndex(['adr_norm'], 'maps_adr_norm');
-			$table->addIndex(['contact_uid'], 'maps_contact_uid');
 		}
 
 		return $schema;
diff --git a/lib/Migration/Version000013Date20190723185417.php b/lib/Migration/Version000013Date20190723185417.php
index 95f1e2b46..c557ebdd6 100644
--- a/lib/Migration/Version000013Date20190723185417.php
+++ b/lib/Migration/Version000013Date20190723185417.php
@@ -41,7 +41,9 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 		if ($schema->hasTable('maps_address_geo')) {
 			$table = $schema->getTable('maps_address_geo');
-			$table->dropColumn('contact_uid');
+			if ($table->hasColumn('contact_uid')) {
+				$table->dropColumn('contact_uid');
+			}
 			$table->addColumn('object_uri', 'string', [
 				'notnull' => true,
 				'default' => '--',