diff --git a/htdocs/lib/settings-dev.inc.php b/htdocs/lib/settings-dev.inc.php
index bf931595..299b6a51 100644
--- a/htdocs/lib/settings-dev.inc.php
+++ b/htdocs/lib/settings-dev.inc.php
@@ -58,7 +58,7 @@
 	$absolute_server_URI = $dev_baseurl . '/';
 	
 	// EMail address of the sender
-	if (!isset($emailaddr)) $emailaddr = 'contact@opencaching.de';
+	if (!isset($emailaddr)) $emailaddr = 'root@local.opencaching.de';
 	
 	// location of cache images
 	if (!isset($picdir)) $picdir = $rootpath . 'images/uploads';
@@ -142,7 +142,7 @@
   
   // data license
 	$opt['logic']['license']['disclaimer'] = true;   // also in lib2/settings-dist.inc.php
-	$opt['logic']['license']['terms'] = 'http://www.opencaching.de/articles.php?page=impressum#datalicense';
+	$opt['logic']['license']['terms'] = $absolute_server_URI . 'articles.php?page=impressum#datalicense';
 
   // see config2/settings-dist.inc.php
 	$opt['template']['default']['locale'] = 'DE';      // may be overwritten by $opt['domain'][...]['locale']
@@ -174,4 +174,7 @@
 	$opt['template']['locales']['DA']['show'] = false;
 	$opt['template']['locales']['PT']['show'] = false;
 	$opt['template']['locales']['JA']['show'] = false;
+
+	// OKAPI settings
+	$disable_semaphores = true;
 ?>
\ No newline at end of file
diff --git a/htdocs/lib/settings-dist.inc.php b/htdocs/lib/settings-dist.inc.php
index f60641d4..9c260457 100644
--- a/htdocs/lib/settings-dist.inc.php
+++ b/htdocs/lib/settings-dist.inc.php
@@ -211,6 +211,10 @@
 	// you can use -1 to use the master (not recommended, because replicated to slaves)
 	$opt['db']['slave']['primary'] = -1;
 
+	// OKAPI settings
+	$disable_semaphores = false;
+
+
 /* post_config() is invoked directly before the first HTML line of the main.tpl.php is sent to the client.
  */
 function post_config()
@@ -226,10 +230,4 @@ function post_config()
 	);
 }
 
-$OKAPI_SETTINGS = array(
-	'OC_BRANCH' => 'oc.de',
-	'SITELANG' => 'de',
-	'VAR_DIR' => $rootpath.'var',
-);
-
 ?>
diff --git a/htdocs/okapi_settings.php b/htdocs/okapi_settings.php
index 731fd9aa..e9830a45 100644
--- a/htdocs/okapi_settings.php
+++ b/htdocs/okapi_settings.php
@@ -25,6 +25,7 @@ function get_okapi_settings()
 		'ADMINS' => array($sql_errormail,'rygielski@mimuw.edu.pl'),
 		'FROM_FIELD' => $emailaddr,
 		'DEBUG' => $debug_page,
+		'DEBUG_PREVENT_SEMAPHORES' => $disable_semaphores,  # not available on current developer system
 		'DB_SERVER' => $dbserver,
 		'DB_NAME' => $dbname,
 		'DB_USERNAME' => $dbusername,