More serialization fixes.