Fixed a couple of build issues and issues with older versions of CGAL.