Workshop fixes