Upgrade settings, fix warnings