Moving some settings from local-dist to base