Fix a few stray issues.