diff --git a/src/TNL/Matrices/CSR.h b/src/TNL/Matrices/CSR.h
index c8f87553ab7bec948186ce4fd6f7ba5c1b9ef9d8..e4564562522765f1806846c4a619a049ec3f768b 100644
--- a/src/TNL/Matrices/CSR.h
+++ b/src/TNL/Matrices/CSR.h
@@ -83,14 +83,10 @@ public:
    __cuda_callable__
    IndexType getRowLengthFast( const IndexType row ) const;
    
-#ifdef HAVE_CUDA
-   //__device__
-   //void getNonZeroRowLengthCudaKernel( const MatrixRow row, typename MatrixRow::IndexType* result );
-   
    IndexType getNonZeroRowLength( const IndexType row ) const;
    
    IndexType getNonZeroRowLengthFast( const IndexType row ) const;
-#endif
+   
    template< typename Real2, typename Device2, typename Index2 >
    void setLike( const CSR< Real2, Device2, Index2 >& matrix );
 
diff --git a/src/TNL/Matrices/CSR_impl.h b/src/TNL/Matrices/CSR_impl.h
index 537c81df745a322f9b3b497841a3eb22813cdeb8..0a682a9dc25cbea51617bb8c5ab89b0a76b0d846 100644
--- a/src/TNL/Matrices/CSR_impl.h
+++ b/src/TNL/Matrices/CSR_impl.h
@@ -138,6 +138,7 @@ Index CSR< Real, Device, Index >::getNonZeroRowLength( const IndexType row ) con
 {
     // TODO: Fix/Implement
     TNL_ASSERT( false, std::cerr << "TODO: Fix/Implement" );
+    return 0;
 //    if( std::is_same< DeviceType, Devices::Host >::value )
 //    {
 //       ConstMatrixRow matrixRow = this->getRow( row );
diff --git a/src/TNL/Matrices/SparseRow_impl.h b/src/TNL/Matrices/SparseRow_impl.h
index 000f961d6c796d631725031fa5c189b6d758a1dc..6c86b9d5176e6b9a52a8a4177907e134b39a3394 100644
--- a/src/TNL/Matrices/SparseRow_impl.h
+++ b/src/TNL/Matrices/SparseRow_impl.h
@@ -135,6 +135,7 @@ getNonZeroElementsCount() const
 {
 //    TODO: Fix/Implement
     TNL_ASSERT( false, std::cerr << "TODO: Fix/Implement" );
+    return 0;
 //    using NonConstIndex = typename std::remove_const< Index >::type;
 //    
 //    NonConstIndex elementCount ( 0 );