Fix deprecation warnings wip