Mouse class tweaks