small fixes during x64 effort