CLUB-80 fixes for the profile