Some of the fixes suggested on GitHub by Simon