diff --git a/Doxyfile b/Doxyfile
index 2e7eec18ca2484eed9df115142c57aa44328a903..1b947de18b2d18cfb32e7e7fac79db90913b630a 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -891,7 +891,6 @@ EXCLUDE_SYMLINKS       = NO
 
 EXCLUDE_PATTERNS       = */Communicators/* \
                          */Config/* \
-                         */Containers/* \
                          */Debugging/* \
                          */Devices/* \
                          */DistributedContainers/* \
diff --git a/src/Benchmarks/Benchmarks.h b/src/Benchmarks/Benchmarks.h
index 2b8b28b892b1c8f2332e0d9e702b8b74228578aa..de3727b21231c8cdcd48c6948b45b2440a511c16 100644
--- a/src/Benchmarks/Benchmarks.h
+++ b/src/Benchmarks/Benchmarks.h
@@ -508,12 +508,12 @@ Benchmark::MetadataMap getHardwareMetadata()
                                        ? Communicators::MpiCommunicator::GetSize( Communicators::MpiCommunicator::AllGroup )
                                        : 1 },
 #endif
-       { "OpenMP enabled", Devices::Host::isOMPEnabled() },
-       { "OpenMP threads", Devices::Host::getMaxThreadsCount() },
+       { "OpenMP enabled", String( Devices::Host::isOMPEnabled() ) },
+       { "OpenMP threads", String( Devices::Host::getMaxThreadsCount() ) },
        { "CPU model name", Devices::SystemInfo::getCPUModelName( cpu_id ) },
-       { "CPU cores", Devices::SystemInfo::getNumberOfCores( cpu_id ) },
-       { "CPU threads per core", Devices::SystemInfo::getNumberOfThreads( cpu_id ) / Devices::SystemInfo::getNumberOfCores( cpu_id ) },
-       { "CPU max frequency (MHz)", Devices::SystemInfo::getCPUMaxFrequency( cpu_id ) / 1e3 },
+       { "CPU cores", String( Devices::SystemInfo::getNumberOfCores( cpu_id ) ) },
+       { "CPU threads per core", String( Devices::SystemInfo::getNumberOfThreads( cpu_id ) / Devices::SystemInfo::getNumberOfCores( cpu_id ) ) },
+       { "CPU max frequency (MHz)", String( Devices::SystemInfo::getCPUMaxFrequency( cpu_id ) / 1e3 ) },
        { "CPU cache sizes (L1d, L1i, L2, L3) (kiB)", cacheInfo },
 #ifdef HAVE_CUDA
        { "GPU name", Devices::CudaDeviceInfo::getDeviceName( activeGPU ) },
diff --git a/src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h b/src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h
index 11ae35b43604546c740e051870808aaac4c264c4..ecc001d6676c5c8021c3e115ed2af49d49bab614 100644
--- a/src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h
+++ b/src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h
@@ -177,11 +177,11 @@ struct SpmvBenchmark
       benchmark.setMetadataColumns( Benchmark::MetadataColumns({
          // TODO: strip the device
 //         {"matrix type", matrix.getType()},
-         {"rows", matrix.getRows()},
-         {"columns", matrix.getColumns()},
+         {"rows", String( matrix.getRows() ) },
+         {"columns", String( matrix.getColumns() ) },
          // FIXME: getMaxRowLengths() returns 0 for matrices loaded from file
 //         {"max elements per row", matrix.getMaxRowLength()},
-         {"max elements per row", maxRowLength},
+         {"max elements per row", String( maxRowLength ) },
       } ));
 
       const bool reorder = parameters.getParameter< bool >( "reorder-dofs" );
diff --git a/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h b/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h
index a898f156b4e2e25915e20ece50539991b25f47b2..c31f776cd4ff571b4f00e85a6ffcef2959a55e50 100644
--- a/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h
+++ b/src/Benchmarks/LinearSolvers/tnl-benchmark-linear-solvers.h
@@ -347,11 +347,11 @@ struct LinearSolversBenchmark
       benchmark.setMetadataColumns( Benchmark::MetadataColumns({
          // TODO: strip the device
 //         {"matrix type", matrixPointer->getType()},
-         {"rows", matrixPointer->getRows()},
-         {"columns", matrixPointer->getColumns()},
+         {"rows", String( matrixPointer->getRows() ) },
+         {"columns", String( matrixPointer->getColumns() ) },
          // FIXME: getMaxRowLengths() returns 0 for matrices loaded from file
 //         {"max elements per row", matrixPointer->getMaxRowLength()},
-         {"max elements per row", maxRowLength},
+         {"max elements per row", String( maxRowLength ) },
       } ));
 
       const bool reorder = parameters.getParameter< bool >( "reorder-dofs" );