diff --git a/build.sh b/build.sh
index 49ccb530..0e19f63d 100755
--- a/build.sh
+++ b/build.sh
@@ -91,7 +91,7 @@ case "$1" in
     ;;
 
   "--coverage"|"coverage")
-    if ! ./configure --prefix="$PREFIX" CPPFLAGS="-DDEBUG" CXXFLAGS="-g -O0 -DDEBUG" --with-unit-test --with-gcov
+    if ! ./configure --prefix="$PREFIX" CPPFLAGS="-DDEBUG" CXXFLAGS="-g -O0 -DDEBUG -DUNIT_TEST" --with-unit-test --with-gcov
     then
       echo "${RED}Configure failed!${NORMAL}" 1>&2
       exit 255
diff --git a/src/include/final/flistview.h b/src/include/final/flistview.h
index f9de75fb..de69c091 100644
--- a/src/include/final/flistview.h
+++ b/src/include/final/flistview.h
@@ -586,7 +586,7 @@ FObject::FObjectIterator
                  , [] (const T& col) -> const FString
                    {
                      const FString s = FString() << col;
-                     return std::move(s);
+                     return s;
                    }
                  );
 
@@ -622,7 +622,7 @@ FObject::FObjectIterator
                  , [] (const ColT& col) -> const FString
                    {
                      const FString s = FString() << col;
-                     return std::move(s);
+                     return s;
                    }
                  );
 
diff --git a/test/ftermopenbsd-test.cpp b/test/ftermopenbsd-test.cpp
index e45d4eef..00cd090b 100644
--- a/test/ftermopenbsd-test.cpp
+++ b/test/ftermopenbsd-test.cpp
@@ -434,7 +434,7 @@ void ftermopenbsdTest::openbsdConsoleTest()
     CPPUNIT_ASSERT ( ! data->hasShadowCharacter() );
     CPPUNIT_ASSERT ( ! data->hasHalfBlockCharacter() );
     CPPUNIT_ASSERT_CSTRING ( term_detection->getTermType(), C_STR("pccon") );
-    
+
     closeConEmuStdStreams();
     exit(EXIT_SUCCESS);
   }