Interfacemgr: Refactoring and minor fixes

No match.