Fixed small issues when not using CGAL library