diff --git a/bin/device-install.bat b/bin/device-install.bat
index d8005255a..d6a034a42 100755
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -31,7 +31,7 @@ IF EXIST %FILENAME% (
 	%PYTHON% -m esptool --baud 115200 erase_flash
 	%PYTHON% -m esptool --baud 115200 write_flash 0x1000 system-info.bin
     for %%f in (littlefs-*.bin) do (
-        %PYTHON% -m esptool --baud 115200 write_flash 0x00390000 %%f
+        %PYTHON% -m esptool --baud 115200 write_flash 0x2B0000 %%f
     )
 	%PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME%
 ) else (
diff --git a/bin/device-install.sh b/bin/device-install.sh
index c42325a0e..95383405a 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -48,7 +48,7 @@ if [ -f "${FILENAME}" ]; then
 	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
 	"$PYTHON" -m esptool  erase_flash
 	"$PYTHON" -m esptool  write_flash 0x1000 system-info.bin
-	"$PYTHON" -m esptool  write_flash 0x00390000 littlefs-*.bin
+	"$PYTHON" -m esptool  write_flash 0x2B0000 littlefs-*.bin
 	"$PYTHON" -m esptool  write_flash 0x10000 ${FILENAME}
 else
 	echo "Invalid file: ${FILENAME}"
diff --git a/partition-table.csv b/partition-table.csv
index dcf41ec41..131b9bc83 100644
--- a/partition-table.csv
+++ b/partition-table.csv
@@ -3,6 +3,5 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x5000,
 otadata,  data, ota,     0xe000,  0x2000,
-app0,     app,  ota_0,   0x10000, 0x1c0000,
-app1,     app,  ota_1,   0x1d0000,0x1c0000,
-spiffs,   data, spiffs,  0x390000,0x070000,
\ No newline at end of file
+app0,     app,  ota_0,   0x10000, 0x2A0000,
+spiffs,   data, spiffs,  0x2B0000,0x150000,
\ No newline at end of file
diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index 91e7b7829..dafceafe0 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -177,9 +177,11 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
             DEBUG_MSG("Sending position ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
             positionModule->sendOurPosition(dest, wantReplies);
         }
-    } else if (nodeInfoModule) {
-        DEBUG_MSG("Sending nodeinfo ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
-        nodeInfoModule->sendOurNodeInfo(dest, wantReplies);
+    } else {
+        if (nodeInfoModule) {
+            DEBUG_MSG("Sending nodeinfo ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
+            nodeInfoModule->sendOurNodeInfo(dest, wantReplies);
+        }
     }
 }