Warrior 5.2 changes ; fixes #301.