Jonathan's initial fixes - April 24