diff --git a/examples/calculator.cpp b/examples/calculator.cpp
index 63f78ce8..680258d5 100644
--- a/examples/calculator.cpp
+++ b/examples/calculator.cpp
@@ -464,7 +464,7 @@ void Calc::drawDispay()
 }
 
 //----------------------------------------------------------------------
-void Calc::sendOnButtonAccelerator()
+inline void Calc::sendOnButtonAccelerator()
 {
   finalcut::FAccelEvent a_ev(fc::Accelerator_Event, getFocusWidget());
   calculator_buttons[On]->onAccel(&a_ev);
diff --git a/examples/rotozoomer.cpp b/examples/rotozoomer.cpp
index a4e38f15..b752af27 100644
--- a/examples/rotozoomer.cpp
+++ b/examples/rotozoomer.cpp
@@ -286,8 +286,7 @@ void RotoZoomer::adjustSize()
 //                               main part
 //----------------------------------------------------------------------
 int main (int argc, char* argv[])
-{
-  constexpr int iterations = 314;
+{  
   bool benchmark{false};
   finalcut::FString report{};
   int quit_code{0};
@@ -310,6 +309,7 @@ int main (int argc, char* argv[])
     app.setNonBlockingRead();
 
     // Create a simple dialog box
+    constexpr int iterations = 314;
     RotoZoomer roto(&app, benchmark, iterations);
 
     if ( benchmark )
diff --git a/examples/treeview.cpp b/examples/treeview.cpp
index 55eb3972..261c8204 100644
--- a/examples/treeview.cpp
+++ b/examples/treeview.cpp
@@ -55,8 +55,8 @@ sInt64 StringToNumber (const finalcut::FString& str)
 }
 
 //----------------------------------------------------------------------
-bool isLessThanInteger ( const finalcut::FString& lhs
-                       , const finalcut::FString& rhs )
+inline bool isLessThanInteger ( const finalcut::FString& lhs
+                              , const finalcut::FString& rhs )
 {
   const sInt64 l_number = StringToNumber(lhs);
   const sInt64 r_number = StringToNumber(rhs);
@@ -64,8 +64,8 @@ bool isLessThanInteger ( const finalcut::FString& lhs
 }
 
 //----------------------------------------------------------------------
-bool isLessThanDouble ( const finalcut::FString& lhs
-                      , const finalcut::FString& rhs )
+inline bool isLessThanDouble ( const finalcut::FString& lhs
+                             , const finalcut::FString& rhs )
 {
   std::setlocale(LC_NUMERIC, "C");
   const double l_number = lhs.toDouble();
@@ -74,8 +74,8 @@ bool isLessThanDouble ( const finalcut::FString& lhs
 }
 
 //----------------------------------------------------------------------
-bool isGreaterThanInteger ( const finalcut::FString& lhs
-                          , const finalcut::FString& rhs )
+inline bool isGreaterThanInteger ( const finalcut::FString& lhs
+                                 , const finalcut::FString& rhs )
 {
   const sInt64 l_number = StringToNumber(lhs);
   const sInt64 r_number = StringToNumber(rhs);
@@ -83,7 +83,7 @@ bool isGreaterThanInteger ( const finalcut::FString& lhs
 }
 
 //----------------------------------------------------------------------
-bool isGreaterThanDouble ( const finalcut::FString& lhs
+inline bool isGreaterThanDouble ( const finalcut::FString& lhs
                          , const finalcut::FString& rhs )
 {
   std::setlocale(LC_NUMERIC, "C");
diff --git a/src/ftermdetection.cpp b/src/ftermdetection.cpp
index e84a2456..76a71ce0 100644
--- a/src/ftermdetection.cpp
+++ b/src/ftermdetection.cpp
@@ -916,7 +916,7 @@ inline const char* FTermDetection::secDA_Analysis_32 (const char[])
 //----------------------------------------------------------------------
 inline const char* FTermDetection::secDA_Analysis_65 (const char current_termtype[])
 {
-  // Terminal ID 65 - DEC VT525
+  // Terminal ID 65 - DEC VT525 and VTE >= 0.53.0
 
   return secDA_Analysis_1 (current_termtype);
 }
diff --git a/src/fvterm.cpp b/src/fvterm.cpp
index 750b3eff..f329aba4 100644
--- a/src/fvterm.cpp
+++ b/src/fvterm.cpp
@@ -1071,7 +1071,7 @@ void FVTerm::putArea (const FPoint& pos, const FTermArea* area)
   // Copies the given area block to the virtual terminal position
 
   FChar* tc{};  // terminal character
-  FChar* ac{};  // area character
+  const FChar* ac{};  // area character
 
   if ( ! area || ! area->visible )
     return;
@@ -1610,7 +1610,7 @@ void FVTerm::updateCharacter ( const FTermArea* area
 }
 
 //----------------------------------------------------------------------
-bool FVTerm::updateVTermCharacter ( FTermArea* area
+bool FVTerm::updateVTermCharacter ( const FTermArea* area
                                   , const FPoint& area_pos
                                   , const FPoint& terminal_pos )
 {
diff --git a/src/include/final/fvterm.h b/src/include/final/fvterm.h
index f9b35ee1..9add61ad 100644
--- a/src/include/final/fvterm.h
+++ b/src/include/final/fvterm.h
@@ -414,7 +414,7 @@ class FVTerm
     static void           updateCharacter ( const FTermArea*
                                           , const FPoint&
                                           , const FPoint& );
-    static bool           updateVTermCharacter ( FTermArea*
+    static bool           updateVTermCharacter ( const FTermArea*
                                                , const FPoint&
                                                , const FPoint& );
     void                  updateVTerm();
diff --git a/src/sgr_optimizer.cpp b/src/sgr_optimizer.cpp
index c5c0b9f6..87eba5b4 100644
--- a/src/sgr_optimizer.cpp
+++ b/src/sgr_optimizer.cpp
@@ -71,7 +71,7 @@ void SGRoptimizer::findParameter()
   // Find SGR parameter
   for (std::size_t i = 0; i < len; i++)
   {
-    if ( csi == true )
+    if ( csi )
     {
       if ( start == NOT_SET )
         start = i;