Kirik bug not appearing in hidden camp and wrong dialogue

Hi, Kirik the little boy is bugged in various ways after the questline finishes (beating red wizards for Neera).

If you save Amanis,Kirik will not appear in Hidden Camp.

If you do not save Amanis and did do Kirik's quest, he will appear in the hidden camp, but have wrong dialogue.

The reason is the code.

When you save Amani OHN_KIRIK_PLOT is set to 12

Ohnamani.d
IF ~ AreaCheck("OH6300")
Global("OHNSUB55","OH6300",2)
~ THEN BEGIN 1 // from:
SAY #93130 /* ~I must leave now! Kirik is waiting for me, I know it! Thank you once again, ! You are a true hero!~ [OH93130] */
IF ~~ THEN DO ~IncrementGlobal("OHN_WM_FREED","GLOBAL",1)
SetGlobal("ohn_kirik_plot","GLOBAL",12)
AddexperienceParty(5000)
FadeFromColor([30.0],0)
MoveBetweenAreas("OH6200",[1280.1033],SSE)
~ EXIT
END

When you enter the camp, the check to spawn Kirik is it must be between 5 and 10, so he won't spawn
Oh6200.bcs
IF
GlobalGT("ohn_kirik_plot","global",5)
GlobalLT("ohn_kirik_plot","global",10)
THEN
RESPONSE #100
SetGlobal("ohn_kirik_plot","global",10)
CreateCreature("ohnkirik",[1335.1060],SSW) // ~Kirik Khal~
END

Finally, Kirik's end-dialogue depends on it being 12

IF ~ AreaCheck("OH6200")
Global("ohn_kirik_plot","global",12)
Global("OHN_KIRIK_FINALE","LOCALS",0)
Global("OHN_KIRIK_WM","global",0)
~ THEN BEGIN 26 // from:
SAY #93505 /* ~Hey! I heard about how you beat the Red Wizards! I'm gonna beat the Red Wizards too. Mama says I can't use magic, so I'm gonna beat them with a dagger to the back!~ */
IF ~~ THEN DO ~SetGlobal("OHN_KIRIK_FINALE","LOCALS",1)
~ GOTO 28
END