Upgrading from 2.x to 3.x caused new errors to appear. Fix them.
Upgrading from 2.x to 3.x caused new errors to appear. Fix them.