PyPi fixes