Fixes for settings