Fixed issues with UpdateCleaner