Fix calls to serializer