Setup script improvements.