New style for updater, fix some old code