Fix settings so local settings are optional