Fix a few formatting issues