Workshop follow up changes