Updating for Python3 support.