Fixes to updater