More fixes for serializer/json