Refinements to setup script