Clean up defaults
Merge branch 'set_defaults'