More tweaks for 64bit