club: some fixes