REF/BUG: more python compat