More shell fixing.