Removing last 3.6.0 deprecation warnings