Update to remove deprecation warnings.