Clean up some minor things.