Tweaks to code.