Fixes for mouse1 and mouse2