diff --git a/src/core/logging/Initialization.cpp b/src/core/logging/Initialization.cpp
index b0a50017aeab801da79e196baecb153a9ec4baeb..420cbbb1ecbe9fdddbe08f8037b34bccf97843f0 100644
--- a/src/core/logging/Initialization.cpp
+++ b/src/core/logging/Initialization.cpp
@@ -23,6 +23,7 @@
 #include "Logging.h"
 
 #include <boost/algorithm/string.hpp>
+
 #include <algorithm>
 #include <sstream>
 #include <string>
@@ -139,7 +140,7 @@ void configureLogging( const Config::BlockHandle & loggingBlock )
    if( loggingBlock.isDefined( "logLevel" ) )
    {
       std::string type = loggingBlock.getParameter< std::string >( "logLevel" );
-      std::transform( type.begin(), type.end(), type.begin(), ::tolower ); //convert to lower case
+      boost::algorithm::to_lower( type );
 
       if( type.compare("warning") == 0 ){
          logging::Logging::instance()->setLogLevel( logging::Logging::WARNING );
@@ -158,7 +159,7 @@ void configureLogging( const Config::BlockHandle & loggingBlock )
    if( loggingBlock.isDefined( "streamLogLevel" ) )
    {
       std::string type = loggingBlock.getParameter< std::string >( "streamLogLevel" );
-      std::transform( type.begin(), type.end(), type.begin(), ::tolower ); //convert to lower case
+      boost::algorithm::to_lower( type );
 
       if( type.compare("warning") == 0 ){
          logging::Logging::instance()->setStreamLogLevel( logging::Logging::WARNING );
@@ -177,7 +178,7 @@ void configureLogging( const Config::BlockHandle & loggingBlock )
    if( loggingBlock.isDefined( "fileLogLevel" ) )
    {
       std::string type = loggingBlock.getParameter< std::string >( "fileLogLevel" );
-      std::transform( type.begin(), type.end(), type.begin(), ::tolower ); //convert to lower case
+      boost::algorithm::to_lower( type );
 
       if( type.compare("warning") == 0 ){
          logging::Logging::instance()->setFileLogLevel( logging::Logging::WARNING );
diff --git a/tests/geometry/VoxelFileTest.cpp b/tests/geometry/VoxelFileTest.cpp
index f75f7277fbf72dc7994f9a52dd3d371a1f2e67b5..3918b08dec89c888e5dc760e3c5f5c51245f4221 100644
--- a/tests/geometry/VoxelFileTest.cpp
+++ b/tests/geometry/VoxelFileTest.cpp
@@ -243,7 +243,7 @@ void runTests(const std::string & filename, size_t xSize, size_t ySize, size_t z
    WALBERLA_CHECK_EQUAL( ySize, geometryFile.ySize() );
    WALBERLA_CHECK_EQUAL( zSize, geometryFile.zSize() );
 
-   numDefaultConstructedElements = std::count( data.begin(), data.end(), 7 );
+   numDefaultConstructedElements = std::count( data.begin(), data.end(), numeric_cast<T>(7) );
    WALBERLA_CHECK_EQUAL( numCells, numDefaultConstructedElements );
 
    data.clear();