squash a few deprecation warnings