Minor Workshop Fixes