Fix a few nitpicks.