Workshop minor changes