more serialization fixes