Further robustness improvements
Merge branch 'parsing_improvements'