WIP fixes for Py2