Tweaks to previous commit.