Index: scripts/usr/local/lib/7dtd/commands/instances.sh
===================================================================
--- scripts/usr/local/lib/7dtd/commands/instances.sh	(revision 480)
+++ scripts/usr/local/lib/7dtd/commands/instances.sh	(revision 481)
@@ -75,5 +75,4 @@
 	
 	$EDITOR $IPATH/config.xml
-	configSetAutoParameters "$INSTANCE"
 	
 	if [ -f "$SDTD_BASE/templates/admins.xml" ]; then
Index: scripts/usr/local/lib/7dtd/commands/start.sh
===================================================================
--- scripts/usr/local/lib/7dtd/commands/start.sh	(revision 480)
+++ scripts/usr/local/lib/7dtd/commands/start.sh	(revision 481)
@@ -56,5 +56,5 @@
 		SSD_DAEMON="--background --no-close"
 		SSD_USER="--chuid $SDTD_USER:$SDTD_GROUP --user $SDTD_USER"
-		OPTS="-logfile $LOG -nographics -configfile=$(getInstancePath $1)/config.xml"
+		OPTS="-logfile $LOG -nographics -configfile=$(getInstancePath $1)/config.xml -TelnetEnabled=true -AdminFileName=admins.xml -UserDataFolder=$(getInstancePath $1) "
 		
 		if [ "$(uname -m)" = "x86_64" ]; then
Index: scripts/usr/local/lib/7dtd/commands/updateengine.sh
===================================================================
--- scripts/usr/local/lib/7dtd/commands/updateengine.sh	(revision 480)
+++ scripts/usr/local/lib/7dtd/commands/updateengine.sh	(revision 481)
@@ -174,6 +174,6 @@
 			PASSWORDARG=-betapassword $BRANCHPASSWORD
 		fi
-		#echo ./steamcmd.sh +login anonymous +force_install_dir $SDTD_BASE/engine +app_update 294420 -validate -beta $BRANCHNAME $PASSWORDARG +quit
-		./steamcmd.sh +login anonymous +force_install_dir $SDTD_BASE/engine +app_update 294420 -validate -beta $BRANCHNAME $PASSWORDARG +quit
+		#echo ./steamcmd.sh +force_install_dir $SDTD_BASE/engine +login anonymous +app_update 294420 -validate -beta $BRANCHNAME $PASSWORDARG +quit
+		./steamcmd.sh +force_install_dir $SDTD_BASE/engine +login anonymous +app_update 294420 -validate -beta $BRANCHNAME $PASSWORDARG +quit
 
 		if [ -d /usr/local/lib/7dtd/server-fixes ]; then
Index: scripts/usr/local/lib/7dtd/common.sh
===================================================================
--- scripts/usr/local/lib/7dtd/common.sh	(revision 480)
+++ scripts/usr/local/lib/7dtd/common.sh	(revision 481)
@@ -120,5 +120,5 @@
 		local APPMANIFEST=$(find $SDTD_BASE/engine -type f -name "appmanifest_294420.acf")
 		if [ -f "$APPMANIFEST" ]; then
-			LOCAL=$(grep betakey "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
+			LOCAL=$(grep -i '"betakey"' "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
 			if [[ -z $LOCAL ]]; then
 				LOCAL="public"
@@ -141,5 +141,5 @@
 		local APPMANIFEST=$(find $SDTD_BASE/engine -type f -name "appmanifest_294420.acf")
 		if [ -f "$APPMANIFEST" ]; then
-			LOCAL=$(grep buildid "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
+			LOCAL=$(grep -i '"buildid"' "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
 			if [ $(isANumber "$LOCAL") -eq 0 ]; then
 				LOCAL=0
@@ -159,5 +159,5 @@
 		local APPMANIFEST=$(find $SDTD_BASE/engine -type f -name "appmanifest_294420.acf")
 		if [ -f "$APPMANIFEST" ]; then
-			LOCAL=$(grep LastUpdated "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
+			LOCAL=$(grep -i '"LastUpdated"' "$APPMANIFEST" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
 			if [ $(isANumber "$LOCAL") -eq 0 ]; then
 				LOCAL=0
Index: scripts/usr/local/lib/7dtd/serverconfig.sh
===================================================================
--- scripts/usr/local/lib/7dtd/serverconfig.sh	(revision 480)
+++ scripts/usr/local/lib/7dtd/serverconfig.sh	(revision 481)
@@ -20,18 +20,4 @@
 ## Generic worker functions
 
-
-# Set parameters for current instance that have forced values:
-#  - TelnetEnabled must be set so that management scripts can work
-#  - AdminFileName is made to point to the local instance admins.xml
-#  - SaveGameFolder is made to point to the instance folder
-#  - UserDataFolder (for GeneratedWorlds) is made to point to the <user home directory>/serverdata/
-# Params:
-#   1: Instance name
-configSetAutoParameters() {
-	setConfigValue "$1" "TelnetEnabled" "true"
-	setConfigValue "$1" "AdminFileName" "admins.xml"
-	setConfigValue "$1" "SaveGameFolder" "$(getInstancePath "$1")"
-	setConfigValue "$1" "UserDataFolder" "$SDTD_BASE/serverdata"
-}
 
 # Query for an instance name (will be saved in $INSTANCE)
@@ -78,5 +64,16 @@
 #   3: New value
 setConfigValue() {
+	local XMLSTARLET_OPTS="-L -P"
 	local CONF=$(getInstancePath $1)/config.xml
-	$XMLSTARLET ed -L -u "/ServerSettings/property[@name='$2']/@value" -v "$3" $CONF
+	local XPATHBASE="//property[@name='$2']"
+	
+	if [ -z $($XMLSTARLET sel -t -v "$XPATHBASE/@name" $CONF) ]; then
+		$XMLSTARLET ed $XMLSTARLET_OPTS \
+			-s "/*[1]" -t elem -n "property" \
+			-i "//property[not(@name)]" -t attr -n "name" -v "$2" \
+			-i "$XPATHBASE" -t attr -n "value" -v "$3" \
+			$CONF
+	else
+		$XMLSTARLET ed $XMLSTARLET_OPTS -u "$XPATHBASE/@value" -v "$3" $CONF
+	fi
 }