mouse: Fix bugs in prev. commit