Bugs found while unit testing
Serializer changes.