Changes to help future upgrades

A few small changes to make future upgrades easier