Fixed some parserstuffs