Fix more parsing bugs