diff --git a/src/TNL/Matrices/BiEllpack.h b/src/TNL/Matrices/BiEllpack.h
index 2612653e55b221ec9419717e4a12ec705d4f0c34..ef5f90d47397c4e8314e5dc64b54c51f60a8f013 100644
--- a/src/TNL/Matrices/BiEllpack.h
+++ b/src/TNL/Matrices/BiEllpack.h
@@ -10,8 +10,8 @@
 
 /****
  * This class implements BiELL format from:
- * 
- * Zheng C., Gu S., Gu T.-X., Yang B., Liu X.-P., 
+ *
+ * Zheng C., Gu S., Gu T.-X., Yang B., Liu X.-P.,
  * BiELL: A bisection ELLPACK-based storage format for optimizing SpMV on GPUs,
  * Journal of Parallel and Distributed Computing, 74 (7), pp. 2639-2647, 2014.
  */
@@ -143,7 +143,6 @@ public:
 
 //	void verifyRowLengths( const typename BiEllpack< Real, Device, Index, StripSize >::CompressedRowLengthsVector& rowLengths );
 
-   
 	template< typename InVector,
 			  typename OutVector >
 #ifdef HAVE_CUDA
diff --git a/src/TNL/Matrices/Matrix.h b/src/TNL/Matrices/Matrix.h
index 3271597f6eac18b7fa15a92cfd2e4331ef8a87cb..a30d8c2a420bc3d0cae2ad07977e72717cc5431f 100644
--- a/src/TNL/Matrices/Matrix.h
+++ b/src/TNL/Matrices/Matrix.h
@@ -96,7 +96,7 @@ public:
 
    template< typename Matrix >
    bool operator != ( const Matrix& matrix ) const;
-   
+
    virtual bool save( File& file ) const;
 
    virtual bool load( File& file );
diff --git a/src/TNL/Matrices/Matrix_impl.h b/src/TNL/Matrices/Matrix_impl.h
index e9cf162cb52dd9f36c53b2b2367b7a29bfa6bfa8..9728020053edca6d340198f666accc32a4aca46d 100644
--- a/src/TNL/Matrices/Matrix_impl.h
+++ b/src/TNL/Matrices/Matrix_impl.h
@@ -130,20 +130,6 @@ bool Matrix< Real, Device, Index >::operator != ( const MatrixT& matrix ) const
    return ! operator == ( matrix );
 }
 
-template< typename Real,
-          typename Device,
-          typename Index >
-void
-Matrix< Real, Device, Index >::
-copyFromHostToCuda( Matrix< Real, Devices::Host, Index >& matrix )
-{
-    this->numberOfColors = matrix.getNumberOfColors();
-    this->columns = matrix.getColumns();
-    this->rows = matrix.getRows();
-
-    this->values.setSize( matrix.getValuesSize() );
-}
-
 template< typename Real,
           typename Device,
           typename Index >
@@ -225,6 +211,20 @@ computeColorsVector(Containers::Vector<Index, Device, Index> &colorsVector)
     }
 }
 
+template< typename Real,
+          typename Device,
+          typename Index >
+void
+Matrix< Real, Device, Index >::
+copyFromHostToCuda( Matrix< Real, Devices::Host, Index >& matrix )
+{
+    this->numberOfColors = matrix.getNumberOfColors();
+    this->columns = matrix.getColumns();
+    this->rows = matrix.getRows();
+
+    this->values.setSize( matrix.getValuesSize() );
+}
+
 #ifdef HAVE_CUDA
 template< typename Matrix,
           typename InVector,
diff --git a/src/TNL/Matrices/SparseRow.h b/src/TNL/Matrices/SparseRow.h
index 7d39b7b2e9508e5973a4f81457a3b1eb58f42cad..e7547ee679e89cef5e2c607720d13d538ba3c31a 100644
--- a/src/TNL/Matrices/SparseRow.h
+++ b/src/TNL/Matrices/SparseRow.h
@@ -56,9 +56,9 @@ class SparseRow
 
    protected:
 
-	   Real* values;
+      Real* values;
 
-	   Index* columns;
+      Index* columns;
 
       Index length, step;
 };
diff --git a/src/UnitTests/Meshes/CMakeLists.txt b/src/UnitTests/Meshes/CMakeLists.txt
index e35856258b5f1adab69a84e27fc429ebe1a1c020..9cc6ed47eefe673b427c392b8bf0cd4008364984 100644
--- a/src/UnitTests/Meshes/CMakeLists.txt
+++ b/src/UnitTests/Meshes/CMakeLists.txt
@@ -7,18 +7,18 @@ TARGET_LINK_LIBRARIES( BoundaryTagsTest
                            tnl )
 
 # Mesh cannot be compiled by nvcc < 9 due to bugs in the compiler
-if( ${BUILD_CUDA} AND ( ${CUDA_VERSION_MAJOR} GREATER 9 OR ${CUDA_VERSION_MAJOR} EQUAL 9 ) )
-    CUDA_ADD_EXECUTABLE( MeshTest MeshTest.cu
-                         OPTIONS ${CXX_TESTS_FLAGS} )
-    TARGET_LINK_LIBRARIES( MeshTest
-                            ${GTEST_BOTH_LIBRARIES}
-                            tnl )
+if( ${BUILD_CUDA} AND ${CUDA_VERSION_MAJOR} GREATER_EQUAL 9 )
+   CUDA_ADD_EXECUTABLE( MeshTest MeshTest.cu
+                        OPTIONS ${CXX_TESTS_FLAGS} )
+   TARGET_LINK_LIBRARIES( MeshTest
+                           ${GTEST_BOTH_LIBRARIES}
+                           tnl )
 
-    CUDA_ADD_EXECUTABLE( MeshOrderingTest MeshOrderingTest.cu
-                         OPTIONS ${CXX_TESTS_FLAGS} )
-    TARGET_LINK_LIBRARIES( MeshOrderingTest
-                            ${GTEST_BOTH_LIBRARIES}
-                            tnl )
+   CUDA_ADD_EXECUTABLE( MeshOrderingTest MeshOrderingTest.cu
+                        OPTIONS ${CXX_TESTS_FLAGS} )
+   TARGET_LINK_LIBRARIES( MeshOrderingTest
+                           ${GTEST_BOTH_LIBRARIES}
+                           tnl )
 else()
    ADD_EXECUTABLE( MeshTest MeshTest.cpp )
    TARGET_COMPILE_OPTIONS( MeshTest PRIVATE ${CXX_TESTS_FLAGS} )