Fixed some bugs found during first run of workshop