Squashing a few bugs with the unit selection code.