Fix issue with servlet upgrades