diff --git a/src/fterm_functions.cpp b/src/fterm_functions.cpp
index a53d78c2..07dd90c0 100644
--- a/src/fterm_functions.cpp
+++ b/src/fterm_functions.cpp
@@ -526,7 +526,7 @@ std::size_t getColumnWidth (const FTermBuffer& tb)
   return std::accumulate ( std::next(tb.begin())
                          , tb.end()
                          , tb.front().attr.bit.char_width
-                         , [] (std::size_t s, FChar c)
+                         , [] (std::size_t s, const FChar& c)
                            {
                              return std::move(s) + c.attr.bit.char_width;
                            }
diff --git a/src/include/final/ftypes.h b/src/include/final/ftypes.h
index f3bc47b0..42e7088b 100644
--- a/src/include/final/ftypes.h
+++ b/src/include/final/ftypes.h
@@ -33,6 +33,7 @@
 #include <cstddef>
 #include <cstring>
 
+#include <array>
 #include <functional>
 #include <limits>
 #include <unordered_map>