More py3 changes