Small improvements to shell