Several fixes with group token registration and group creation