Fixes for updater
Minor fixes to updater