Assortment of fixes suggested by Mark