Fix group and role flashbag messages