Some 6.0 Warrior changes.

Closes #38