Fix a couple of bugs with clicking on squares.