Fixes for collaboration workshop in SF