diff --git a/src/dbvzRegisterAccessors.c.h b/src/dbvzRegisterAccessors.c.h
index 21de6a2..f1befb7 100644
--- a/src/dbvzRegisterAccessors.c.h
+++ b/src/dbvzRegisterAccessors.c.h
@@ -345,7 +345,7 @@ static void updateCsdAddressLines(void){
          dbvzChipSelects[DBVZ_CHIP_DX_RAM].mask |= 0x00800000;
 
       //address line 22 is enabled
-      if((sdctrl & 0x0030) == 0x0010)
+      if(palmEmulatingM500 || (sdctrl & 0x0030) == 0x0010)
          dbvzChipSelects[DBVZ_CHIP_DX_RAM].mask |= 0x00400000;
    }
    else{
diff --git a/tools/desktop/getOs4FunctionNames.py b/tools/desktop/getOs4FunctionNames.py
index 55f4279..f89c2f4 100644
--- a/tools/desktop/getOs4FunctionNames.py
+++ b/tools/desktop/getOs4FunctionNames.py
@@ -21,8 +21,7 @@ def makeString(location):
       
    return string
 
-#scan from ROM start to ROM end
-for func in idautils.Functions(0x10000000, 0x103D7C00):
+for func in idautils.Functions():
    str = makeString(idc.get_func_attr(func, FUNCATTR_END) + 1) + ('_%X' % idc.get_func_attr(func, FUNCATTR_START))
    idc.set_name(idc.get_func_attr(func, FUNCATTR_START), str, SN_NOCHECK)
    print str