Fix a few small issues.