diff --git a/common/common.h b/common/common.h
index c373932..1ebd67d 100644
--- a/common/common.h
+++ b/common/common.h
@@ -21,6 +21,7 @@
 
 #include <stdint.h>
 typedef uint8_t u8;
+typedef uint16_t u16;
 typedef uint32_t u32;
 typedef uint64_t u64;
 typedef int8_t s8;
diff --git a/common/menu-entry.c b/common/menu-entry.c
index e655cd0..b852609 100644
--- a/common/menu-entry.c
+++ b/common/menu-entry.c
@@ -560,8 +560,8 @@ void menuEntryFileassocLoad(const char* filepath) {
     char target_file_extension[PATH_MAX+1];
     char target_filename[PATH_MAX+1];
 
-    char app_author[ENTRY_AUTHORLENGTH+1];
-    char app_version[ENTRY_VERLENGTH+1];
+    char app_author[ENTRY_AUTHORLENGTH+2];
+    char app_version[ENTRY_VERLENGTH+2];
 
     uint8_t *app_icon_gfx = NULL;
     uint8_t *app_icon_gfx_small = NULL;
diff --git a/common/menu.c b/common/menu.c
index 0f6c3b1..cd184bd 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -6,6 +6,8 @@
 #include "switch/runtime/nxlink.h"
 #endif
 
+double menuTimer;
+
 char rootPathBase[PATH_MAX];
 char rootPath[PATH_MAX+8];
 
diff --git a/common/menu.h b/common/menu.h
index 7ac6aa2..5db2950 100644
--- a/common/menu.h
+++ b/common/menu.h
@@ -77,7 +77,7 @@ typedef enum
     IMAGE_MODE_RGBA32
 } ImageMode;
 
-double menuTimer;
+extern double menuTimer;
 
 #ifdef __cplusplus
 extern "C" {