Bug fixes on MousesAndHoles