Fixes suggested by Roger