Minor tweaks that didn't get checked in last time.