More update check fixing (duplicate code removed) (lib)