o Fix deprecation warnings