x86 fixes in runtime