Misc fixes for DiscoUpdater