More Py3 fixin'.