fixes suggested by Ben