Little shell tweaks