Cleaning up 64bit related fixme's