Some more fixes for more mice.