Fixed Warrior bugs