Fixes suggested by Curtis