Merge branch 'westmann/parser_fixes'