Fix a couple more cell selection bugs.