Fixes for new models in serialization