Fix a couple of small bug fixes from recent changes.