Changed mouse handling