Fixing some python packaging issues in master