Minor changes on workshop stuff