Reference fixes
Fixes for third party parsers