Fix py2 builds