Minor changes for lightstudio