Tweaks for parser