Setup script simplification & fix