Cleanup some small things.