More shell updates