Fix deprecation warnings resulting from dependency upgrades