diff --git a/apponly.proto b/apponly.proto
index 4f02a22..533f9ca 100644
--- a/apponly.proto
+++ b/apponly.proto
@@ -16,8 +16,8 @@ message ServiceEnvelope {
     /** The global channel ID it was sent on */
     string channel_id = 2;
 
-    /** The sending mesh. FIXME, is this necessary? can we use this to authenticate/prevent fake
-    nodeid impersonation for senders - i.e. use mesh id (which is authenticated) + local node id as
+    /** The sending gateway. Can we use this to authenticate/prevent fake
+    nodeid impersonation for senders? - i.e. use gateway/mesh id (which is authenticated) + local node id as
     the globally trusted nodenum */
-    string mesh_id = 3;
+    string gateway_id = 3;
 }
\ No newline at end of file
diff --git a/deviceonly.options b/deviceonly.options
index e8fb491..10f8818 100644
--- a/deviceonly.options
+++ b/deviceonly.options
@@ -7,5 +7,5 @@
 # FIXME - max_count is actually 32 but we save/load this as one long string of preencoded MeshPacket bytes - not a big array in RAM
 *DeviceState.receive_queue max_count:1
 
-*DeviceState.secondary_channels max_count:4
+*DeviceState.secondary_channels max_count:7