Small fixes suggested by Dave