South Africans Orlando Pirates avoided a shock Confederation Cup exit, coming through a tricky last-32 tie with a 2-2 draw away to Ugandans Revenue Authority on Saturday.
The Kampala tax collectors, who lost the first leg 2-1 in Soweto last month, raised hopes of causing an upset when they took the lead through Mugerwa after 36 minutes.
But Pirates came back through a goal from Makola and a Manyisa penalty to lead 3-1 overall.
The Ugandans made it a tense last few minutes for Pirates after Frank Kalanda's late strike, but 2-2 was how the match ended with Pirates taking the tie 3-2 on aggregate.
Pirates, champions of Africa in 1995, defeated clubs from Uganda and Gabon en route to that triumph 20 years ago.
And, by coincidence, they will face Gabonese Mounana in the final qualifying round before play-offs against Caf Champions League round-of-16 losers.
Mounana appeared certain to progress having established a 4-0 first-leg lead over Zambians Power Dynamos in Libreville.
But they ended the return match clinging to the narrowest of advantages after losing 3-0 as Kelvin Mubanga, Alex N'gonga and Christopher Munthali scored in central city Kitwe.
Mounana host Pirates in mid-April with the return match two weeks later.
Ivorians ASEC Mimosas, runners-up when Pirates became African champions, upset Libyans Al-Ittihad 2-1 in Tunis after being held in Abidjan.
Abdussalam Mohamed put the Tripoli club ahead on five minutes and Mensah Brefo levelled midway through the opening half.
With time running out and a penalty shootout looming, Mahan Marc Goua set up Krahire Zakri to score the goal that won the match and the tie.
Elsewhere, Democratic Republic of Congo club MK Etancheite scored four goals within 28 minutes to crush Sudanese visitors Al-Ahly Shendy 5-1 this weekend.
The triumph gave the Kinshasa outfit a 6-3 aggregate victory after trailing 2-1 from the first leg three weeks ago.
Next up for the Congolese in the second-tier Caf club competition will be Nigerians Warri Wolves or Ethiopians Dedebit, who trail 2-0 going into the return match at home.
It was a dramatic improvement in home form by Etancheite after only drawing 1-1 with Congo Brazzaville opponents Etoile in the preliminary round.
Algerians ASO Chlef edged Guinean visitors Horoya 1-0 at Stade Mohamed Boumezrag and then triumphed 5-3 on penalties to set up a last-16 date with Tunisians Club Africain.
Mohamed Namani claimed the lone goal on 48 minutes to cancel the 1-0 lead Horoya established in a first leg switched from Guinea to Mali because of the Ebola epidemic.
Ghanaians Hearts of Oak, winners of the first Confederation Cup in 2004, got through 5-3 on aggregate against Senegalese Olympique Ngor, winning their second leg 3-2 away from home. Paul Acquah snatched the match-winner two minutes from time.
Malians Djoliba and Onze Createurs and Tanzanians Young Africans also qualified although none of them could celebrate a second-leg victory.
Createurs held Sahel 0-0 in Niger,Djoliba forced a similar scoreline against Petrojet in Egypt and Young Africans lost 1-0 to Platinum in Zimbabwe after building a four-goal advantage at home.