Update default settings to latest from #798