Merge "Fix bugs for x86 platform"