Changes to Updater as well as some minor fixes.