Fixes suggested by Tony