Small fixes to some things caught by toolness.