Bug fixes and persistentGroupLink