New fixes for parsing plugin.