Handle legacy URLs gracefully, plus misc upgrades