Fix a few problems with the multi tenant service