diff --git a/common/config.mk b/common/config.mk
index 9082eae6e..92fb33cef 100644
--- a/common/config.mk
+++ b/common/config.mk
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-COMMON_INCS = -I../common -I../relay
+COMMON_INCS = -I ./$(PLATFORM) -I../common -I../relay
 INCLUDES += $(COMMON_INCS) -I./
 
 COMMONDIR ?= ../common
diff --git a/palm/Makefile b/palm/Makefile
index 6b6369d79..0cfeeba92 100644
--- a/palm/Makefile
+++ b/palm/Makefile
@@ -72,9 +72,7 @@ endif
 endif
 endif
 
-ifneq ($(LANG),en_US)
 PLATFORM := $(PLATFORM)_$(shell echo $(LANG) | tr [A-Z] [a-z])
-endif
 
 APPNAME = "$(NAME)"
 
@@ -263,7 +261,7 @@ ship-all:
 $(BITMAPS)/%.pbitm: $(BITMAPS)/%.bmp
 	bmtoa $< > $@
 
-$(PLATFORM)/objs.prc: LocalizedStrIncludes.h $(OBJS) gdbload
+$(PLATFORM)/objs.prc: $(PLATFORM)/LocalizedStrIncludes.h $(OBJS) gdbload
 	@rm -f *.grc *.bin
 ifeq ($(ARCH),ARM_ONLY)
 	$(CC) $(OBJS) -o tmp.o
@@ -290,20 +288,21 @@ xwords4.rcp: l10n/xwords4_$(LANG).rcp.pre xwords4defines.h $(BITMAP_RSRCS)
 # up with offsets out of sync with the .h file.  Not sure what to do
 # about this....  Clean builds are probably a safe fallback.
 
-LocalizedStrIncludes.h StrL03e8.bin: \
+$(PLATFORM)/LocalizedStrIncludes.h StrL03e8.bin: \
 		./l10n/StrRes_$(LANG).pre ./l10n/mkstrsres.c
 	gcc $(CFLAGS) $(FORMATDEFINES) \
 		-DLANGSTRFILE=\"$<\" ./l10n/mkstrsres.c \
 		-o mkstrsres
-	./mkstrsres StrL03e8.bin LocalizedStrIncludes.h
+	mkdir -p $(PLATFORM)
+	./mkstrsres StrL03e8.bin $(PLATFORM)/LocalizedStrIncludes.h
 	rm -f mkstrsres
 
 ifneq (x$(BUILD_AS_PNOLET)x, xx)
 .PHONY : pnolet
 
-pnolet: LocalizedStrIncludes.h
-	$(MAKE) -f Makefile.PNO MEMDEBUG=$(MEMDEBUG) MYDEFS="$(MYDEFS_ARM) -DAPPID=\'$(APPID)\' \
-	-DAPPNAME=\\\"$(APPNAME)\\\""
+pnolet: $(PLATFORM)/LocalizedStrIncludes.h
+	$(MAKE) -f Makefile.PNO MEMDEBUG=$(MEMDEBUG) PLATFORM=$(PLATFORM) \
+		MYDEFS="$(MYDEFS_ARM) -DAPPID=\'$(APPID)\' -DAPPNAME=\\\"$(APPNAME)\\\"" 
 endif
 
 # GDB seems confused by relative paths these days.  So generate the
@@ -317,9 +316,10 @@ gdbload:
 clean:
 	cd ../common && $(MAKE) PLATFORM=$(PLATFORM) $@
 	rm -rf $(PLATFORM)/*.[oa] xwords4 *.bin *.stamp *.[pg]rc \
-		xwords4.rcp *.btxt $(PLATFORM)/* LocalizedStrIncludes.h gdbload
+		xwords4.rcp *.btxt $(PLATFORM)/* $(PLATFORM)/LocalizedStrIncludes.h \
+			gdbload
 ifneq (x$(BUILD_AS_PNOLET)x, xx)
-	$(MAKE) -f Makefile.PNO clean
+	$(MAKE) -f Makefile.PNO PLATFORM=$(PLATFORM) clean
 endif
 
 #cmod03E8.bin: palmdraw.c Makefile
diff --git a/palm/Makefile.PNO b/palm/Makefile.PNO
index fbbd662df..f6d3b4cf9 100644
--- a/palm/Makefile.PNO
+++ b/palm/Makefile.PNO
@@ -1,6 +1,5 @@
 # -*- mode: Makefile; compile-command: "make ARCH=ARM_ONLY"; -*-
 
-PLATFORM = PALM_PNO
 PALMDIR = /usr/local/share/palmdev/sdk-5r3/include
 
 # Which arm suite to use?  Well, the suite in prc-tools-arm is broken
@@ -22,7 +21,7 @@ ifeq ($(MEMDEBUG),TRUE)
 DEBUG = -DMEM_DEBUG -DDEBUG
 endif
 
-INCLUDE += \
+INCLUDES += \
 	-I$(PALMDIR) \
 	-I$(PALMDIR)/Libraries \
 	-I$(PALMDIR)/Dynamic \
@@ -35,8 +34,8 @@ INCLUDE += \
 	-I$(PALMDIR)/Extensions/Bluetooth \
 
 ifneq (, $(findstring XWFEATURE_FIVEWAY,$(MYDEFS)))
-INCLUDE += -I/usr/local/share/palmdev/Handspring5
-INCLUDE += -I/usr/local/share/palmdev/Handspring5/68K
+INCLUDES += -I/usr/local/share/palmdev/Handspring5
+INCLUDES += -I/usr/local/share/palmdev/Handspring5/68K
 GENDEFS += -DXWFEATURE_FIVEWAY
 endif
 
@@ -44,9 +43,6 @@ ifneq (, $(findstring XWFEATURE_BLUETOOTH,$(MYDEFS)))
 GENDEFS += -DXWFEATURE_BLUETOOTH
 endif
 
-INCLUDE += \
-	-I. -I../common -I../relay
-
 # NOTE!!!! Added the -w flag to supress all warnings since arm-elf-gcc
 # does so much bitching about the Palm headers.  Need to fix that, or
 # use the arm-palmos-gcc, or something.  But for now, -w....
@@ -55,7 +51,7 @@ ARMCCFS = $(CCFLAGS) -DNATIVE $(DEBUG) \
 	-nostartfiles -mshort-load-bytes -nodefaultlibs -ffixed-r9 \
 	-mpic-register=r10 -msingle-pic-base -fpic \
 	-Wno-multichar \
-	$(INCLUDE)
+	$(INCLUDES)
 
 ARMLDFS = -Xlinker --script=./ldscript.arm -lgcc
 
diff --git a/palm/palmmain.c b/palm/palmmain.c
index 7a95a02de..a1010fb7a 100644
--- a/palm/palmmain.c
+++ b/palm/palmmain.c
@@ -979,9 +979,10 @@ initHighResGlobals( PalmAppGlobals* globals )
         && ((vers & sysFtrNumUIHardwareHas5Way) != 0) && !globals->isZodiac;
 
     err = FtrGet( hsFtrCreator, hsFtrIDNavigationSupported, &vers );
-    XP_ASSERT( errNone == err );
-    XP_ASSERT( vers == 1 || vers == 2 );
-    globals->isTreo600 = (err == errNone) && (vers == 1);
+    if ( errNone == err ) {
+        XP_ASSERT( vers == 1 || vers == 2 );
+        globals->isTreo600 = (err == errNone) && (vers == 1);
+    }
 #endif
 
 #ifdef FEATURE_SILK
diff --git a/palm/xwords4defines.h b/palm/xwords4defines.h
index 5347fb152..6884dbf3d 100644
--- a/palm/xwords4defines.h
+++ b/palm/xwords4defines.h
@@ -436,7 +436,7 @@
 #ifdef XWFEATURE_BLUETOOTH
 # define XW_PALM_VERSION_STRING "4.3a9"
 #else
-# define XW_PALM_VERSION_STRING "4.2rc2"
+# define XW_PALM_VERSION_STRING "4.2"
 #endif
 #define CUR_PREFS_VERS 0x0405