Make shell context a bit nicer