Fixed compile errors.
Merge branch 'master' into lexer-ast