Minor tweaks to stuff.