Less fiddling after updates....