Fix a few more parsing bugs