Fixed pypi dependency issues