Some tweakles for shell mode.