The fights take a lot of chapters to finish in the manga.
I just read the Zagan arc, and it finished much better than the anime did. Alibaba was not a liability in the fight.
EDIT: They really did switch around a lot of events in the Zagan arc, most of the changes making Alibaba look bad. I have no idea why they chose to do this.