Fixes for parser.