Various fixes prior to pypi release.