diff --git a/src/apps/bin/keymap/Keymap.cpp b/src/apps/bin/keymap/Keymap.cpp
index a5230682b0..da2395a6ff 100644
--- a/src/apps/bin/keymap/Keymap.cpp
+++ b/src/apps/bin/keymap/Keymap.cpp
@@ -285,7 +285,7 @@ Keymap::ComputeChars(const char *buffer, struct re_registers &regs, int i, int &
 	} else if (sscanf(buffer + regs.start[i], "0x%s", hexChars) > 0) {
 		length = strlen(hexChars) / 2;
 		for (uint32 j=0; j<length; j++)
-			sscanf(hexChars + 2*j, "%02x", (unsigned short *)current + j);
+			sscanf(hexChars + 2*j, "%02x", (uint8*)current + j);
 	}
 	fChars[offset] = length;
 	offset += length + 1;
diff --git a/src/apps/bin/keymap/key_map.cpp b/src/apps/bin/keymap/key_map.cpp
index 683bc76790..14d2a6a4bf 100644
--- a/src/apps/bin/keymap/key_map.cpp
+++ b/src/apps/bin/keymap/key_map.cpp
@@ -55,7 +55,6 @@ int main(int argc, char **argv)
 			} else if (operation == 'l') {
 				Keymap keymap;
 				keymap.LoadSource(stdin);
-				
 				keymap.SaveAsCurrent();
 				return 0;
 			}