Update several deprecation warnings