Further tweaks for compatibility with upgrades