More fixes related to project leaving/joining