Fixed some build issues related to CGAL