Clean up some defaults