Cleaning up a couple of things.