Bug fixes for settings change and notification