Fixes for GenericEntryUpdater