Strengthen setup script