Try harder to fix Py2 issues