diff --git a/library/Core.cpp b/library/Core.cpp
index 33f66d767e..bb631414c6 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -201,7 +201,7 @@ uint32_t PerfCounters::getUnpausedFps() {
 
 struct CommandDepthCounter
 {
-    static const int MAX_DEPTH = 20;
+    static constexpr int MAX_DEPTH = 20;
     static thread_local int depth;
     CommandDepthCounter() { depth++; }
     ~CommandDepthCounter() { depth--; }
@@ -902,8 +902,8 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, s
     }
     else if (first == "plug")
     {
-        const char *header_format = "%30s %10s %4s %8s\n";
-        const char *row_format =    "%30s %10s %4i %8s\n";
+        constexpr auto header_format = "%30s %10s %4s %8s\n";
+        constexpr auto row_format =    "%30s %10s %4zu %8s\n";
         con.print(header_format, "Name", "State", "Cmds", "Enabled");
 
         plug_mgr->refresh();
@@ -1601,7 +1601,7 @@ bool Core::InitMainThread() {
     {
         if (!Version::git_xml_match())
         {
-            const char *msg = (
+            constexpr auto msg = (
                 "*******************************************************\n"
                 "*               BIG, UGLY ERROR MESSAGE               *\n"
                 "*******************************************************\n"