Fix some setup issues with the setup script