backport deprecation warning fixes

These were applied some time ago to master, but they should have been applied to stable.

We should not release 1.3.2 with all these deprecation warnings still triggering in the tests.