Kill off more deprecation warnings