Be more py3 compatible