Small PatchMaker and Updater bugs correction