diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc
index 5d04c7313..d999dbd4e 100644
--- a/src/xenia/app/emulator_window.cc
+++ b/src/xenia/app/emulator_window.cc
@@ -168,7 +168,7 @@ using namespace xe::hid;
 using namespace xe::gpu;
 
 constexpr std::string_view kRecentlyPlayedTitlesFilename = "recent.toml";
-constexpr std::string kBaseTitle = "Xenia-canary";
+constexpr std::string_view kBaseTitle = "Xenia-canary";
 
 EmulatorWindow::EmulatorWindow(Emulator* emulator,
                                ui::WindowedAppContext& app_context,
@@ -181,7 +181,7 @@ EmulatorWindow::EmulatorWindow(Emulator* emulator,
           std::make_unique<ui::ImGuiDrawer>(window_.get(), kZOrderImGui)),
       display_config_game_config_load_callback_(
           new DisplayConfigGameConfigLoadCallback(*emulator, *this)) {
-  base_title_ = kBaseTitle +
+  base_title_ = std::string(kBaseTitle) +
 #ifdef DEBUG
 #if _NO_DEBUG_HEAP == 1
                 " DEBUG"
diff --git a/src/xenia/kernel/xam/apps/messenger_app.h b/src/xenia/kernel/xam/apps/messenger_app.h
index 62d49ee72..71ff1bd7e 100644
--- a/src/xenia/kernel/xam/apps/messenger_app.h
+++ b/src/xenia/kernel/xam/apps/messenger_app.h
@@ -31,4 +31,4 @@ class MessengerApp : public App {
 }  // namespace kernel
 }  // namespace xe
 
-#endif XENIA_KERNEL_XAM_APPS_MESSENGER_APP_H_
+#endif  // XENIA_KERNEL_XAM_APPS_MESSENGER_APP_H_