collaborate fixes