Fixed a couple of build issues when building with older version sof boost and without CGAL.