More fixes to dynamic settings.