Kil'Jaeden - Phase 1 fixes