Avoid deprecation warnings.
7 files changed