Tidy a couple of minor things up.