More mouse fixes