Fixed functions and calls in the parser