diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index d72370e77..91e1f8a6d 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1762,7 +1762,7 @@ struct pager_layout_testcase_t {
 
             wcstring text = sd.line(0).to_string();
             if (text != expected) {
-                fwprintf(stderr, L"width %zu got %d<%ls>, expected %d<%ls>\n", this->width,
+                fwprintf(stderr, L"width %zu got %zu<%ls>, expected %zu<%ls>\n", this->width,
                          text.length(), text.c_str(), expected.length(), expected.c_str());
                 for (size_t i = 0; i < std::max(text.length(), expected.length()); i++) {
                     fwprintf(stderr, L"i %zu got <%lx> expected <%lx>\n", i,
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index ee906f994..32e91e087 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -774,7 +774,7 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
         this->report_error(statement_node, msg, eval_cmd.c_str());
     } else if (err_code != ENOENT) {
         this->report_error(statement_node, _(L"The file '%ls' is not executable by this user"),
-                           cmd ? cmd : L"UNKNOWN");
+                           cmd);
     } else {
         // Handle unrecognized commands with standard command not found handler that can make better
         // error messages.