More py3 support.