More fixes for 3Feb2014