diff --git a/script/install_SUITESPARSE.sh b/script/install_SUITESPARSE.sh
index 459a521043462fddd7e6baa7a5c5374d4a3983ee..1d649d246676d8bd362fb7f7e8e279fe8fb1f757 100755
--- a/script/install_SUITESPARSE.sh
+++ b/script/install_SUITESPARSE.sh
@@ -42,12 +42,12 @@ else
 
     if [ x"$CXX" == x"icpc" ]; then
       export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/$1/OPENBLAS/lib"
+      sed -i "/\sLIB\s=\s-lm\s-lrt/c\LIB = -shared-intel -lm -lrt -lifcore" SuiteSparse_config/SuiteSparse_config.mk
       sed -i "/INSTALL_LIB\s=\s\/usr\/local\/lib/c\INSTALL_LIB = $1\/SUITESPARSE\/lib" SuiteSparse_config/SuiteSparse_config.mk
       sed -i "/INSTALL_INCLUDE\s=\s\/usr\/local\/include/c\INSTALL_INCLUDE = $1\/SUITESPARSE\/include" SuiteSparse_config/SuiteSparse_config.mk
       sed -i "/\sLAPACK\s=\s-llapack/c\LAPACK = " SuiteSparse_config/SuiteSparse_config.mk
       sed -i "/\sBLAS\s=\s\-lopenblas/c\BLAS = -L$1/OPENBLAS/lib -lopenblas -lpthread" SuiteSparse_config/SuiteSparse_config.mk
     else
-      sed -i "/\sLIB\s=\s-lm\s-lrt/c\LIB\s=\s-shared-intel\s-lm\s-lrt\s-lifcore" SuiteSparse_config/SuiteSparse_config.mk
       sed -i "/INSTALL_LIB\s=\s\/usr\/local\/lib/c\INSTALL_LIB = $1\/SUITESPARSE\/lib" SuiteSparse_config/SuiteSparse_config.mk
       sed -i "/INSTALL_INCLUDE\s=\s\/usr\/local\/include/c\INSTALL_INCLUDE = $1\/SUITESPARSE\/include" SuiteSparse_config/SuiteSparse_config.mk
       sed -i "/\sLAPACK\s=\s-llapack/c\LAPACK = " SuiteSparse_config/SuiteSparse_config.mk
diff --git a/src/Decomposition/CartDecomposition_unit_test.hpp b/src/Decomposition/CartDecomposition_unit_test.hpp
index 034188054df229d1f2cd9ab33d4baf3aa0a85b7f..c6b14b9cb2dc60e08be64d0de42536a121d0553b 100755
--- a/src/Decomposition/CartDecomposition_unit_test.hpp
+++ b/src/Decomposition/CartDecomposition_unit_test.hpp
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_non_periodic_test)
 
 		if (found == false)
 		{
-			const openfpm::vector<size_t> pr2 = dec.template ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
+			const openfpm::vector<size_t> pr2 = dec.ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
 		}
 
 		BOOST_REQUIRE_EQUAL(found,true);
@@ -184,7 +184,7 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_periodic_test)
 		Point<3,float> p = b.rnd();
 
 		// Check that ghost_processorsID return that processor number
-		const openfpm::vector<size_t> & pr = dec.template ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
+		const openfpm::vector<size_t> & pr = dec.ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
 
 		bool found = false;
 
@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_periodic_test)
 
 		if (found == false)
 		{
-			const openfpm::vector<size_t> pr2 = dec.template ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
+			const openfpm::vector<size_t> pr2 = dec.ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
 		}
 
 		BOOST_REQUIRE_EQUAL(found,true);
diff --git a/src/Graph/DistGraphFactory.hpp b/src/Graph/DistGraphFactory.hpp
index 33aba91f7a8f109689a8083993b8251611a38617..770b8cc2405af6461e5be75b3ee9e14f77461511 100755
--- a/src/Graph/DistGraphFactory.hpp
+++ b/src/Graph/DistGraphFactory.hpp
@@ -517,7 +517,7 @@ public:
 						if (end_v < g.size())
 						{
 							// Add an edge and set the the edge property to the size of the face (communication weight)
-							gp.template addEdge(start_v, end_v, v_id, end_v);
+							gp.addEdge(start_v, end_v, v_id, end_v);
 						}
 					}
 				}
diff --git a/src/Vector/vector_dist_cell_list_tests.hpp b/src/Vector/vector_dist_cell_list_tests.hpp
index 099173f2d9f9a826a567435ecf917656ae95e659..87fdc2838f7da0e9ab01f58deb4ac88933b980e5 100644
--- a/src/Vector/vector_dist_cell_list_tests.hpp
+++ b/src/Vector/vector_dist_cell_list_tests.hpp
@@ -264,7 +264,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_cl_random_vs_reorder_forces_test )
 			// Initialize vd
 			vd_initialize<dim,decltype(vd)>(vd, v_cl, k_int);
 
-			vd.template ghost_get<0>();
+			vd.ghost_get<0>();
 
 			//Get a cell list
 
@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_cl_random_vs_reorder_forces_test )
 
 			vd.reorder(4);
 
-			vd.template ghost_get<0>();
+			vd.ghost_get<0>();
 
 			auto NN2 = vd.getCellList(r_cut);