Py3 fix
More Py3 fixery