groups: some join / leave bug fixes