small fixes for x86 vs x64 execution