OSX: Improve on-click logging