Fix composing with new settings model