More tiny fixes

Really, it's esier just looking at the diffs than trying to come up with
descriptions of what I changed.