Functional fixes related to changes to the ext mgr