Making friendlier to build on, and for python3