Parse errors fixed