diff --git a/README.md b/README.md
index 4a263a33..411460b4 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ By default, the container will download the latest version of the "vanilla" [Min
    * [Running on RaspberryPi](#running-on-raspberrypi)
    * [Contributing](#contributing)
 
-<!-- Added by: runner, at: Fri Nov  5 02:00:06 UTC 2021 -->
+<!-- Added by: runner, at: Fri Nov  5 19:39:24 UTC 2021 -->
 
 <!--te-->
 
@@ -875,6 +875,7 @@ The server icon which has been set doesn't get overridden by default. It can be
 ### Rcon
 
 To use rcon use the `ENABLE_RCON` and `RCON_PASSWORD` variables.
+The default RCON password is _"minecraft",_ but it's **highly** recommended to override that.
 By default rcon port will be `25575` but can easily be changed with the `RCON_PORT` variable.
 
     docker run -d -e ENABLE_RCON=true -e RCON_PASSWORD=testing
diff --git a/scripts/start-deployVanilla b/scripts/start-deployVanilla
index 0b618800..ed8eadbc 100755
--- a/scripts/start-deployVanilla
+++ b/scripts/start-deployVanilla
@@ -41,6 +41,14 @@ if [ ! -e "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   fi
 fi
 
+if versionLessThan 1.6; then
+  if ! [[ -L /data/minecraft_server.jar && /data/minecraft_server.jar -ef "/data/$SERVER" ]]; then
+    rm -f /data/minecraft_server.jar
+    ln -s "/data/$SERVER" /data/minecraft_server.jar
+  fi
+  SERVER=minecraft_server.jar
+fi
+
 isDebugging && ls -l
 
 exec "${SCRIPTS:-/}start-setupWorld" "$@"
diff --git a/scripts/start-setupServerProperties b/scripts/start-setupServerProperties
index 80931ec2..3e67e6bf 100755
--- a/scripts/start-setupServerProperties
+++ b/scripts/start-setupServerProperties
@@ -217,9 +217,9 @@ if isTrue "${ENABLE_AUTOPAUSE}"; then
   fi
 fi
 
-if isDebugging; then
+if isDebugging && [ -f "${SERVER_PROPERTIES}" ]; then
   log "DEBUG Dumping server.properties"
   cat "${SERVER_PROPERTIES}"
 fi
 
-exec ${SCRIPTS:-/}start-setupEnvVariables $@
+exec "${SCRIPTS:-/}start-setupEnvVariables" "$@"