Fixes for x86 platform support (master)