Fixed some parser stuff