Minor fixes suggested by Roger & Kenny