Go settings update.
Fix a few broken settings.
Merge branch 'master' into go