Making small changes to try to fix the upgrade