More fix in setup script