Address PR feedback, fix MutableSettings contains