More upgrade changes