First bunch of fixes after mouse handling review