I got to Meepo and talked to him. He took me to the queen (can't remember her name and I'm at work). I didn't let Meepo join my party and went ahead through the door to the new area. The strange thing was that I was able to leave the area while the door was still closed.

This is leaving area TC0013 and entering TC0014 if my memory is correct.
I found Calcryx and talked to him. He didn't want to go with me and attacked me. After two hits he agreed to go with me and I accepted his surrender. But Calcryx stays an enemy and keeps attacking me, so the only solution is to kill him. No cutscene starts or anything.
After his surrender the variable (I believe it's named TalkedToCalcryx) is set to 2, but both Meepo and the queen check to see if the variable is 3. I cannot get the key from the queen.

Can anyone point me in the right direction please so I can get past this and continue this great mod? I have tried to stand still and take Calcryx beating to see if he had a timer that would make him surrender but he just doesn't surrender. I entered with one party member and after the second successful hit he ran away to make sure that I don't try to hit the dragon before he surrenders but nothing works.
PS: I have reinstalled everything; BGII,
ToB,
ToB patch, Classic Adventures v0.3 and the patch v0.32