Review fixes for serializers-refactoring