Fix-up PyPi stuff