Tweaks to internal consistency checking