Ken's patch applied to fix the settings issues.