diff --git a/inc/desktop/type.h b/inc/desktop/type.h
index df35c35c..3968b340 100644
--- a/inc/desktop/type.h
+++ b/inc/desktop/type.h
@@ -11,5 +11,7 @@ typedef uint32_t u32;
 typedef int8_t s8;
 typedef int16_t s16;
 typedef int32_t s32;
+typedef uint64_t u64;
+typedef int64_t s64;
 
 #endif
diff --git a/inc/luarpc_rpc.h b/inc/luarpc_rpc.h
index d628c728..82d54593 100644
--- a/inc/luarpc_rpc.h
+++ b/inc/luarpc_rpc.h
@@ -1,7 +1,6 @@
 #include "cexcept.h"
 #include "type.h"
 #include "rpc_serial.h"
-#warning Not sure which of the two serial.h this should include
 
 /****************************************************************************/
 // Parameters
diff --git a/rpc-lua.lua b/rpc-lua.lua
index 0c0058a2..e01229ef 100644
--- a/rpc-lua.lua
+++ b/rpc-lua.lua
@@ -26,8 +26,8 @@ else
 end
 
 -- Compiler/linker options
-builder:set_compile_cmd( sf( "gcc -O2 -g %s -Wall %s -c $(FIRST) -o $(TARGET)", local_include, cdefs ) )
-builder:set_link_cmd( "gcc -o $(TARGET) $(DEPENDS) -lm" )
+builder:set_compile_cmd( sf( "gcc -m32 -O2 -g %s -Wall %s -c $(FIRST) -o $(TARGET)", local_include, cdefs ) )
+builder:set_link_cmd( "gcc -m32 -o $(TARGET) $(DEPENDS) -lm" )
 
 -- Build everything
 builder:make_exe_target( output, lua_full_files )