Update Manager fixes