Add some py2/3 compat