Minor tweaks to fix a few very minor little edge cases.