Resolved some parser issues