diff --git a/bin/uf2-convert.bat b/bin/uf2-convert.bat
new file mode 100644
index 000000000..242bec3ab
--- /dev/null
+++ b/bin/uf2-convert.bat
@@ -0,0 +1,2 @@
+@echo off
+if [%1]==[] (echo "Please specify a platformio NRF target (i.e. rak4631) as the first argument.") else (python3 .\bin\uf2conv.py .\.pio\build\%1\firmware.hex -c -o .\.pio\build\%1\firmware.uf2 -f 0xADA52840)
\ No newline at end of file
diff --git a/src/mesh/generated/admin.pb.h b/src/mesh/generated/admin.pb.h
index ab4152434..e27ee193c 100644
--- a/src/mesh/generated/admin.pb.h
+++ b/src/mesh/generated/admin.pb.h
@@ -4,9 +4,9 @@
 #ifndef PB_ADMIN_PB_H_INCLUDED
 #define PB_ADMIN_PB_H_INCLUDED
 #include <pb.h>
+#include "channel.pb.h"
 #include "mesh.pb.h"
 #include "radioconfig.pb.h"
-#include "channel.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
diff --git a/src/mesh/generated/deviceonly.pb.h b/src/mesh/generated/deviceonly.pb.h
index 591c3cc2f..129e0b817 100644
--- a/src/mesh/generated/deviceonly.pb.h
+++ b/src/mesh/generated/deviceonly.pb.h
@@ -4,8 +4,8 @@
 #ifndef PB_DEVICEONLY_PB_H_INCLUDED
 #define PB_DEVICEONLY_PB_H_INCLUDED
 #include <pb.h>
-#include "mesh.pb.h"
 #include "channel.pb.h"
+#include "mesh.pb.h"
 #include "radioconfig.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40