Serializer fixes