BUG: More fixes in setup script