Fixing setup files (not tested)