removing some deprecation warnings