Clean up couple of things.