Fixing a few bugs for the updater