diff --git a/src/common/font_loader.cpp b/src/common/font_loader.cpp
index 3d6f0f86..9cb3eaeb 100644
--- a/src/common/font_loader.cpp
+++ b/src/common/font_loader.cpp
@@ -33,7 +33,6 @@
 #include <memory>
 #include <utility>
 #include <cstring>
-#include <optional>
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/regex.hpp>
 
diff --git a/src/common/font_loader.h b/src/common/font_loader.h
index d2986e0e..644ed98e 100644
--- a/src/common/font_loader.h
+++ b/src/common/font_loader.h
@@ -31,6 +31,7 @@
 #include <boost/property_tree/ptree.hpp>
 
 #include <string>
+#include <optional>
 
 /**
 * \class CFontLoader
diff --git a/src/graphics/engine/text.cpp b/src/graphics/engine/text.cpp
index 0f3d5c6f..ed063129 100644
--- a/src/graphics/engine/text.cpp
+++ b/src/graphics/engine/text.cpp
@@ -291,7 +291,7 @@ private:
     {
         if (auto font = fontLoader.GetFont(type))
         {
-            m_fonts[type] = MakeUnique<MultisizeFont>(std::move(*font));
+            m_fonts[type] = std::make_unique<MultisizeFont>(std::move(*font));
             return true;
         }
         m_error = "Error on loading fonts: font type " + ToString(type) + " is not configured";
@@ -319,7 +319,7 @@ private:
             return nullptr;
         }
         GetLogger()->Debug("Loaded font file %s (font size = %d)\n", multisizeFont->fileName.c_str(), pointSize);
-        auto newFont = MakeUnique<CachedFont>(std::move(file), pointSize);
+        auto newFont = std::make_unique<CachedFont>(std::move(file), pointSize);
         if (newFont->font == nullptr)
         {
             m_error = std::string("TTF_OpenFont error ") + std::string(TTF_GetError());
@@ -335,7 +335,7 @@ private:
         m_lastFontSize = pointSize;
     }
 
-    bool IsLastCachedFont(FontType font, int pointSize)
+    bool IsLastCachedFont(FontType font, int pointSize) const
     {
         return
             m_lastCachedFont != nullptr &&