Changes to core to fix multiple serialization / persistence problems in server.