Updated to build correctly on cwolf