Tweaks to base code.