Fix a few minor parsing bugs.