Some quite helpful fixes