Fix some outstanding parsing bugs