Fixes to namespaced models