Fix deprecation warnings, maybe