diff --git a/k11_extension/source/svc/UnmapProcessMemoryEx.c b/k11_extension/source/svc/UnmapProcessMemoryEx.c
index 9b81d1b..f672299 100644
--- a/k11_extension/source/svc/UnmapProcessMemoryEx.c
+++ b/k11_extension/source/svc/UnmapProcessMemoryEx.c
@@ -29,6 +29,9 @@
 
 Result UnmapProcessMemoryEx(Handle processHandle, void *dst, u32 size)
 {
+    if (GET_VERSION_MINOR(kernelVersion) < 37) // < 6.x
+        return UnmapProcessMemory(processHandle, dst, size); // equivalent when size <= 64MB
+
     Result          res = 0;
     u32             sizeInPage = size >> 12;
     KLinkedList     list;
diff --git a/sysmodules/rosalina/include/menu.h b/sysmodules/rosalina/include/menu.h
index 35532ec..cfb9491 100644
--- a/sysmodules/rosalina/include/menu.h
+++ b/sysmodules/rosalina/include/menu.h
@@ -71,8 +71,11 @@ extern Handle preTerminationEvent;
 
 extern u32 menuCombo;
 
-u32     waitInputWithTimeout(u32 msec);
-u32     waitInput(void);
+u32 waitInputWithTimeout(s32 msec);
+u32 waitInput(void);
+
+u32 waitComboWithTimeout(s32 msec);
+u32 waitCombo(void);
 
 bool menuCheckN3ds(void);
 u32 menuCountItems(const Menu *menu);