Some fixes to the update check mechanism