squash some deprecation warnings