Updated deprecation warnings for 3.5