Serialization Refactor Fixes