Minor changes to mousetracking