Shell issues fixed