Fix some more problems in order to handle namespaced models correctly

This should work for single as well as multiple archive modes.