Serialization fixes.