Fix up mouse handling