Tweaks to make debugging easier.