Work around some import shadowing
Fix deprecation