Serialization Issue Fixes