More fixes for Py3.