More Shell refactoring compilation fixes