Trackball fixes

Trackball fixes, take 3!