Update workshop branch

Merge in a small quantity of changes and fixes