diff --git a/minecraft-server/start-deployFTB b/minecraft-server/start-deployFTB
index c8a0c4e6..9d3b3f2a 100755
--- a/minecraft-server/start-deployFTB
+++ b/minecraft-server/start-deployFTB
@@ -73,8 +73,20 @@ if [[ $startScriptCount = 0 ]]; then
 fi
 
 if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l) = 0 ]]; then
-    echo "Please make sure you are using the server version of the FTB modpack!"
-    exit 2
+
+    forgeJar=$(find ${FTB_BASE_DIR} -name 'forge*.jar' -a -not -name 'forge*installer')
+    if [[ $forgeJar ]]; then
+      echo "No entry script found, so building one for ${forgeJar}"
+      cat > ${FTB_BASE_DIR}/ServerStart.sh <<EOF
+#!/bin/sh
+. ./settings-local.sh
+java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar ${forgeJar} nogui
+EOF
+      chmod +x ${FTB_BASE_DIR}/ServerStart.sh
+    else
+      echo "Please make sure you are using the server version of the FTB modpack!"
+      exit 2
+    fi
 fi
 
 export FTB_SERVER_START=$(find ${FTB_BASE_DIR} $entryScriptExpr)
diff --git a/minecraft-server/start-minecraftFinalSetup b/minecraft-server/start-minecraftFinalSetup
index 775bc899..341fa686 100755
--- a/minecraft-server/start-minecraftFinalSetup
+++ b/minecraft-server/start-minecraftFinalSetup
@@ -25,7 +25,7 @@ fi
 
 # Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
 echo "Checking for JSON files."
-JSON_FILES=$(find . -name '*.json')
+JSON_FILES=$(find . -maxdepth 1 -name '*.json')
 for j in $JSON_FILES; do
   if [[ $(python -c "print open('$j').read().strip()==''") = True ]]; then
     echo "Fixing JSON $j"