Warrior bug fixes hopefully