Correct the default settings for un-clustered mode as well.