Minor shell tweaks