Fixes for new Settings system