less deprecation warnings