Fixes for warrior for resolve.  Still not perfect though..