Some group join fixes
Still in need of group join functionality