CLUB-581, cosmetic fixes pt2