diff --git a/install b/install
index 029a1902e7722ed7efbba631ff47c2e9c92c7784..2b9489d97e9e589b113b65761c9ff77ccfe4ff01 100755
--- a/install
+++ b/install
@@ -2,7 +2,7 @@
 
 TARGET=TNL
 INSTALL_PREFIX=${HOME}/local
-WITH_CUDA=no
+WITH_CUDA=yes
 WITH_CUSPARSE=no
 CUDA_ARCHITECTURE=2.0
 TEMPLATE_EXPLICIT_INSTANTIATION=yes
diff --git a/src/core/tnlFile.h b/src/core/tnlFile.h
index 4ad2b324edc2be7c327893ba5f2342ccd560c161..cf10693eb53a2104d657fe495c3fa69f617f551d 100644
--- a/src/core/tnlFile.h
+++ b/src/core/tnlFile.h
@@ -118,7 +118,7 @@ class tnlFile
 	            const Index elements );
 
 	template< typename Type, typename Device >
-	bool write( Type* buffer );
+	bool write( const Type* buffer );
 #else        
    template< typename Type, typename Device = tnlHost, typename Index = int >
    bool read( Type* buffer,
@@ -132,7 +132,7 @@ class tnlFile
                const Index elements );
 
    template< typename Type, typename Device = tnlHost >
-   bool write( Type* buffer );
+   bool write( const Type* buffer );
 
 #endif
 
@@ -149,7 +149,7 @@ bool tnlFile :: read( Type* buffer )
 };
 
 template< typename Type, typename Device >
-bool tnlFile :: write( Type* buffer )
+bool tnlFile :: write( const Type* buffer )
 {
    return write< Type, Device, int >( buffer, 1 );
 };
@@ -247,7 +247,7 @@ bool tnlFile :: read( Type* buffer,
 
 template< class Type, typename Device, typename Index >
 bool tnlFile ::  write( const Type* buffer,
-                           const Index elements )
+                        const Index elements )
 {
    if( ! fileOK )
    {
diff --git a/src/implementation/core/memory-operations.h b/src/implementation/core/memory-operations.h
index cfc3fe2a4120720b535150b10184ff9753f719af..9917d6833ef237557229deadc7e2073fb524bb20 100644
--- a/src/implementation/core/memory-operations.h
+++ b/src/implementation/core/memory-operations.h
@@ -192,7 +192,7 @@ bool copyMemoryCudaToHost( DestinationElement* destination,
    abort(); // TODO: fix this
    cudaMemcpy( destination,
                source,
-               size * sizeof( Element ),
+               size * sizeof( SourceElement ),
                cudaMemcpyDeviceToHost );
    if( ! checkCudaDevice )
    {
diff --git a/src/implementation/mesh/tnlLinearGridGeometry_impl.h b/src/implementation/mesh/tnlLinearGridGeometry_impl.h
index f6d5e7daad56741e23fe94834e3ad4ef50615ed7..46d2cfb4ebd0223477517429e1bf99c7ef876239 100644
--- a/src/implementation/mesh/tnlLinearGridGeometry_impl.h
+++ b/src/implementation/mesh/tnlLinearGridGeometry_impl.h
@@ -354,7 +354,7 @@ bool tnlLinearGridGeometry< 2, Real, Device, Index > :: save( tnlFile& file ) co
 {
    if( ! this -> parametricStep. save( file ) ||
        ! this -> proportions. save( file ) ||
-       ! file. write( &this -> numberOfSegments ) ||
+       ! file. write< IndexType, DeviceType >( &this -> numberOfSegments ) ||       
        ! this -> ySegments. save( file ) ||
        ! this -> ySegmentsLeftOffsets. save( file ) ||
        ! this -> ySegmentsRightOffsets. save( file ) )
@@ -369,13 +369,11 @@ bool tnlLinearGridGeometry< 2, Real, Device, Index > :: load( tnlFile& file )
 {
    if( ! this -> parametricStep. load( file ) ||
        ! this -> proportions. load( file ) ||
-       ! file. read( &this -> numberOfSegments ) ||
+       ! file. read< IndexType, DeviceType >( &this -> numberOfSegments ) ||
        ! this -> ySegments. load( file ) ||
        ! this -> ySegmentsLeftOffsets. load( file ) ||
        ! this -> ySegmentsRightOffsets. load( file ) )
-   {
       return false;
-   }
    return true;
 };
 
diff --git a/src/matrix/tnlRgCSRMatrix.h b/src/matrix/tnlRgCSRMatrix.h
index 96cb51cc5656bbd3bef52ca60c1e655d23fb9de2..642923fac9add303318a7bb01bb1f6e0850d9f03 100644
--- a/src/matrix/tnlRgCSRMatrix.h
+++ b/src/matrix/tnlRgCSRMatrix.h
@@ -500,7 +500,7 @@ template< typename Real, typename Device, typename Index >
 bool tnlRgCSRMatrix< Real, Device, Index > :: copyFrom( const tnlRgCSRMatrix< Real, Device2, Index >& rgCSRMatrix )
 {
    dbgFunctionName( "tnlRgCSRMatrix< Real, Device, Index >", "copyFrom" );
-   tnlAssert( rgCSRMatrix. getSize() > 0, cerr << "Copying from matrix " < rgCSRMatrix. getName() << " with non-positiove size." );
+   tnlAssert( rgCSRMatrix. getSize() > 0, cerr << "Copying from matrix " << rgCSRMatrix. getName() << " with non-positiove size." );
 
    this -> cudaBlockSize = rgCSRMatrix. cudaBlockSize;
    this -> groupSize = rgCSRMatrix. groupSize;
diff --git a/tests/unit-tests/core/cuda/tnlCudaDeviceCheckTester.h b/tests/unit-tests/core/cuda/tnlCudaDeviceCheckTester.h
index b0f9f0d47b98fbbeb88c727c7da2b5561cda4784..1cbf3df58181cdfd297b779a8b5b3a79fefbb0b6 100644
--- a/tests/unit-tests/core/cuda/tnlCudaDeviceCheckTester.h
+++ b/tests/unit-tests/core/cuda/tnlCudaDeviceCheckTester.h
@@ -18,6 +18,9 @@
 #ifndef TNLCUDADEVICECHECKTESTER_H_
 #define TNLCUDADEVICECHECKTESTER_H_
 
+#include <tnlConfig.h>
+
+#ifdef HAVE_CPPUNIT
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestResult.h>
 #include <cppunit/TestCaller.h>
@@ -30,6 +33,7 @@
 __global__ void simpleKernel()
 {
    int tIdx = threadIdx. x;
+   tIdx ++;
 }
 #endif
 
@@ -71,5 +75,9 @@ class tnlCudaDeviceCheckTester : public CppUnit :: TestCase
    };
 };
 
+#else
+class tnlCudaDeviceCheckTester
+{};
+#endif /* HAVE_CPPUNIT */
 
 #endif /* TNLCUDADEVICECHECKTESTER_H_ */
diff --git a/tests/unit-tests/core/cuda/tnlCudaMemoryOperationsTester.h b/tests/unit-tests/core/cuda/tnlCudaMemoryOperationsTester.h
index 565f0be711c144ab1b34cd58da9ba2930e072a87..4ba5f58a38da9776709941fc9fff5b7208c537d1 100644
--- a/tests/unit-tests/core/cuda/tnlCudaMemoryOperationsTester.h
+++ b/tests/unit-tests/core/cuda/tnlCudaMemoryOperationsTester.h
@@ -18,6 +18,9 @@
 #ifndef TNLCUDAMEMORYOPERATIONSTESTER_H_
 #define TNLCUDAMEMORYOPERATIONSTESTER_H_
 
+#include <tnlConfig.h>
+
+#ifdef HAVE_CPPUNIT
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestResult.h>
 #include <cppunit/TestCaller.h>
@@ -126,6 +129,9 @@ class tnlCudaMemoryOperationsTester : public CppUnit :: TestCase
 
 };
 
-
+#else
+class tnlCudaMemoryOperationsTester
+{};
+#endif /* HAVE_CPPUNIT */
 
 #endif /* TNLCUDAMEMORYOPERATIONSTESTER_H_ */
diff --git a/tests/unit-tests/core/cuda/tnlCudaReductionTester.h b/tests/unit-tests/core/cuda/tnlCudaReductionTester.h
index 0bd7d097a4057cb242426627ffdd6440eaff7c19..9324d9dedf4e40b7f6ae1bc82df37fb894416072 100644
--- a/tests/unit-tests/core/cuda/tnlCudaReductionTester.h
+++ b/tests/unit-tests/core/cuda/tnlCudaReductionTester.h
@@ -19,6 +19,9 @@
 #ifndef TNLCUDAREDUCTIONTESTER_H_
 #define TNLCUDAREDUCTIONTESTER_H_
 
+#include <tnlConfig.h>
+
+#ifdef HAVE_CPPUNIT
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestResult.h>
 #include <cppunit/TestCaller.h>
@@ -805,5 +808,9 @@ class tnlCudaReductionTester : public CppUnit :: TestCase
 
 };
 
+#else
+class tnlCudaReductionTester
+{};
+#endif /* HAVE_CPPUNIT */
 
 #endif /* TNLCUDAREDUCTIONTESTER_H_ */
diff --git a/tests/unit-tests/core/cuda/tnlCudaVectorOperationsTester.h b/tests/unit-tests/core/cuda/tnlCudaVectorOperationsTester.h
index 71e28dab9f05fdb6bbb040cbff992522a33970d3..d4589e8660701e02886ec061099ac080a5e70400 100644
--- a/tests/unit-tests/core/cuda/tnlCudaVectorOperationsTester.h
+++ b/tests/unit-tests/core/cuda/tnlCudaVectorOperationsTester.h
@@ -18,6 +18,9 @@
 #ifndef TNLCUDAVECTOROPERATIONSTESTER_H_
 #define TNLCUDAVECTOROPERATIONSTESTER_H_
 
+#include <tnlConfig.h>
+
+#ifdef HAVE_CPPUNIT
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestResult.h>
 #include <cppunit/TestCaller.h>
@@ -213,5 +216,10 @@ class tnlCudaVectorOperationsTester : public CppUnit :: TestCase
 
 };
 
+#else
+template< typename Type >
+class tnlCudaVectorOperationsTester
+{};
+#endif /* HAVE_CPPUNIT */
 
 #endif /* TNLCUDAVECTOROPERATIONSTESTER_H_ */
diff --git a/tests/unit-tests/core/tnlArrayTest.cpp b/tests/unit-tests/core/tnlArrayTest.cpp
index 9782352a306698836e373b1be30051bb55e2fe17..4184e8c35650aa9764442ae0afca73eec4a3a345 100644
--- a/tests/unit-tests/core/tnlArrayTest.cpp
+++ b/tests/unit-tests/core/tnlArrayTest.cpp
@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <cstdlib>
 #include "tnlArrayTester.h"
 #include "../tnlUnitTestStarter.h"
 
diff --git a/tests/unit-tests/tnlUnitTestStarter.h b/tests/unit-tests/tnlUnitTestStarter.h
index b828c2148d92539227e6cdeea5523d0aa812a034..9e3a543ba026b580b919cc9e0eeb1802c2514bd3 100644
--- a/tests/unit-tests/tnlUnitTestStarter.h
+++ b/tests/unit-tests/tnlUnitTestStarter.h
@@ -45,7 +45,7 @@ class tnlUnitTestStarter
       std :: cerr << "Error: CPPUNIT is missing." << std :: endl;
       return false;
 #endif
-   };
+   }
 };
 
 #endif /* TNLUNITTESTSTARTER_H_ */