Fix minor issues in setup script