Some bug fixes for pypi.