More tidying up of OSX input