Setup script improvements