Fixing things broke by recent dep upgrades.