Stupid RMI440 changes