Proper 64bit support