Small fixes to cheshire programs