Model registry review fixes

Model registry review fixes