Fix a few errors around the place.