Fixes for install from Pypi

Fixes for install from Pypi