A minimum of Python3 fixes so that installation works without errors/warnings