Fix a few more formatting issues.