There's deleted scenes. It's been a while, but I remember one of them is a continuation of the fight scene in the rain with the guards dressed as women. The French guy fights in it. Letting you know much earlier in the movie that he can fight. There's other things too.
Did you watch the DVD with the extra footage? Changes the movie a bit.