Fixing minor shell bugs.