Fix a few left-over bad things.