diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 23be64e74..14a435456 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -86,7 +86,7 @@ static char ourId[5];
 GeoCoord geoCoord;
 
 // OEM Config File
-static const char *oemConfigFile = "/prefs/oem.proto";
+static const char *oemConfigFile = "/oem/oem.proto";
 OEMStore oemStore;
 
 #ifdef SHOW_REDRAWS
diff --git a/src/modules/CannedMessageModule.h b/src/modules/CannedMessageModule.h
index 33f60dd61..784e40fc1 100644
--- a/src/modules/CannedMessageModule.h
+++ b/src/modules/CannedMessageModule.h
@@ -74,7 +74,7 @@ class CannedMessageModule :
     int currentMessageIndex = -1;
     cannedMessageModuleRunState runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
     char payload;
-    int cursor = 0;
+    unsigned int cursor = 0;
     String freetext = "";  // Text Buffer for Freetext Editor
 
     char messageStore[CANNED_MESSAGE_MODULE_MESSAGES_SIZE+1];