diff --git a/docs/configuration/server-properties.md b/docs/configuration/server-properties.md
index 98594e6b..9881e324 100644
--- a/docs/configuration/server-properties.md
+++ b/docs/configuration/server-properties.md
@@ -396,7 +396,7 @@ be configured by setting `LEVEL_TYPE` to [an expected type listed here](https://
 
 For some of the level types, `GENERATOR_SETTINGS` can be used to further customize the world generation.
 
-To configure the `GENERATOR_SEETINGS` you need to add the appropriate `GeneratorOptions` JSON configuration. In the case of a superflat world, you may omit the `flat_world_options`.
+To configure the `GENERATOR_SETTINGS` you need to add the appropriate `GeneratorOptions` JSON configuration. In the case of a superflat world, you may omit the `flat_world_options`.
 
 The layers are applied from -64 and up and are added in the order of the list
 
diff --git a/scripts/start-deployLimbo b/scripts/start-deployLimbo
index 8921306f..6a96a749 100755
--- a/scripts/start-deployLimbo
+++ b/scripts/start-deployLimbo
@@ -65,4 +65,4 @@ fi
 export LEVEL
 
 export FAMILY=LIMBO
-exec ${SCRIPTS:-/}start-setupWorld $@
+exec ${SCRIPTS:-/}start-setupWorld "$@"
diff --git a/scripts/start-deployNanoLimbo b/scripts/start-deployNanoLimbo
index a5a0f00b..fd79e5d3 100755
--- a/scripts/start-deployNanoLimbo
+++ b/scripts/start-deployNanoLimbo
@@ -16,4 +16,4 @@ fi
 export SERVER
 export FAMILY=LIMBO
 
-exec ${SCRIPTS:-/}start-setupMounts $@
+exec ${SCRIPTS:-/}start-setupMounts "$@"
diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index 82b79984..27ce4d4c 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -253,14 +253,8 @@ if isTrue "${USE_MEOWICE_FLAGS}"; then
   -XX:+RewriteBytecodes
   -XX:+RewriteFrequentPairs
   -XX:+UseFPUForSpilling
-  -XX:+UseFastStosb
-  -XX:+UseNewLongLShift
   -XX:+UseVectorCmov
   -XX:+UseXMMForArrayCopy
-  -XX:+UseXmmI2D
-  -XX:+UseXmmI2F
-  -XX:+UseXmmLoadAndClearUpper
-  -XX:+UseXmmRegToRegMoveAll
   -XX:+EliminateLocks
   -XX:+DoEscapeAnalysis
   -XX:+AlignVector
@@ -269,13 +263,25 @@ if isTrue "${USE_MEOWICE_FLAGS}"; then
   -XX:+UseCharacterCompareIntrinsics
   -XX:+UseCopySignIntrinsic
   -XX:+UseVectorStubs
-  -XX:UseAVX=2
-  -XX:UseSSE=4
   "
+  if [[ $(arch) == "x86_64" ]]; then
+    JVM_XX_OPTS="${JVM_XX_OPTS}
+    -XX:+UseFastStosb
+    -XX:+UseNewLongLShift
+    -XX:+UseXmmI2D
+    -XX:+UseXmmI2F
+    -XX:+UseXmmLoadAndClearUpper
+    -XX:+UseXmmRegToRegMoveAll
+    -XX:UseAVX=2
+    -XX:UseSSE=4
+    "
+  else
+    log "cpu not x86_64, disabling architecture specific flags"
+  fi
 fi
 
 if isTrue "${USE_MEOWICE_GRAALVM_FLAGS}"; then
-  if [[ $java_major_version -lt 25 ]]; then
+  if [[ $java_major_version -gt 23 ]]; then
     log "Java 24 or higher detected, using modified GraalVM flags"
     JVM_XX_OPTS="${JVM_XX_OPTS}
     -XX:+UseFastJNIAccessors