Tweaks to get parse errors working well