Fixed up some parser issues