Fixing json serializers