got rid of most deprecation warnings under 2.11