Fixed setup script