actually fix deprecation warnings