Fix build due to refactoring of the warlib