Fixes to mouse order