Tidy up a few minor things.