Partial fix to compile on X86