Resolve Type hierarchies correctly

- plus temp disable focus/refocus stuff