More Py3 support..