Untested changes for install with python3.