Fix more class refs to the Shell class
Tie off some minor additions here