Minor changes during preparation of workshop