Some more fixes for some more mice.