JH's fixes - Feb 27th