serialization fixes