Some more fixes to Can shell, it is going to be a can shell day :P