Fixes for modelregistry