Misc fixes to collaboration.