Cleaning up some default values.