Bug fixes for parser integration