Groups are no longer tracked globally
Crash fixes