Minor changes during preparation for workshop