Fix group IDs