Fixes to setup py