Clean up some of the defaults.