Updated to build properly on cwolf