more preparation for 64bit support