Fixes for the updater tool