Changes to make sure we get upgraded components (or not, in one case)