Fix Settings and default config issues