Fix a couple of typos and coding standards