diff --git a/src/servers/input/Jamfile b/src/servers/input/Jamfile
index 1536827ad6..36a96b2220 100644
--- a/src/servers/input/Jamfile
+++ b/src/servers/input/Jamfile
@@ -1,5 +1,30 @@
 SubDir OBOS_TOP src servers input ;
 
+rule MkKeymapHeader
+{
+	local binary = $(1) ;
+	local source = $(2) ;
+
+	SetupObjectsDir ;
+
+	SEARCH on $(source) = $(SEARCH_SOURCE) ;
+	MakeLocate $(binary) : $(LOCATE_TARGET) ;
+
+	Depends $(binary) : $(source) keymap ;
+	MkKeymapHeader1 $(binary) : keymap $(source) ;
+	LocalClean clean : $(binary) ;
+}
+
+actions MkKeymapHeader1
+{
+	$(2[1]) -o "$(1)" -h "$(2[2-])" ;
+}
+
+MkKeymapHeader [ FGristFiles SystemKeymap.cpp ] : US-International.keymap ;
+
+SEARCH on US-International.keymap
+	  += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) apps bin keymap ] ;
+
 if $(COMPILE_FOR_R5) {
 	SubDirC++Flags -DCOMPILE_FOR_R5 ;
 }
@@ -22,6 +47,8 @@ Server input_server :
 	MouseSettings.cpp
 	KeyboardSettings.cpp
 
+	SystemKeymap.cpp
+
 	# storage
 	AddOnMonitor.cpp
 	AddOnMonitorHandler.cpp
diff --git a/src/servers/input/MouseSettings.cpp b/src/servers/input/MouseSettings.cpp
index 136f0bfa73..c50633cc77 100644
--- a/src/servers/input/MouseSettings.cpp
+++ b/src/servers/input/MouseSettings.cpp
@@ -120,7 +120,7 @@ MouseSettings::SaveSettings()
 	file.Write(&fSettings.accel, sizeof(fSettings.accel));
 	file.Write(&fSettings.click_speed, sizeof(fSettings.click_speed));
 #else
-	file.Write(fSettings, sizeof(fSettings));
+	file.Write(&fSettings, sizeof(fSettings));
 #endif
 
 	// who is responsible for saving the mouse mode?