Minor changes for compatibility with old worlds based on java object serialization.