Fix some DeprecationWarnings.
2 files changed