Improved Mac mouse handling