Minor changes
Minor workshop changes