Minor tweaks for settings and the delegate.