More serialization fixes