diff --git a/src/modules/modmenu/events/cheat-options-update.h b/src/modules/modmenu/events/cheat-options-update.h
index 692fa38..48c09c3 100644
--- a/src/modules/modmenu/events/cheat-options-update.h
+++ b/src/modules/modmenu/events/cheat-options-update.h
@@ -5,8 +5,9 @@ namespace ModMenuModule {
 	template<typename, typename = void>
 	struct has_options_t : std::false_type {};
 
-	template<typename T>
-	struct has_options_t<T, std::void_t<typename T::OptionsT>> : std::true_type {};
+	template<typename CheatT>
+	struct has_options_t<CheatT, std::void_t<typename CheatT::OptionsT>> : std::true_type {};
+
 	template<typename CheatT>
 	class CheatOptionsUpdateEvent : public Core::EventBase {
 		static_assert(has_options_t<CheatT>::value, "CheatT must define `OptionsT` (e.g. `using OptionsT = ...;`)");
diff --git a/src/modules/modmenu/quick-actions/spawn-saved-vehicle.cpp b/src/modules/modmenu/quick-actions/spawn-saved-vehicle.cpp
index 929b749..f42494c 100644
--- a/src/modules/modmenu/quick-actions/spawn-saved-vehicle.cpp
+++ b/src/modules/modmenu/quick-actions/spawn-saved-vehicle.cpp
@@ -43,7 +43,7 @@ void ModMenuModule::SpawnSavedVehicleAction::Execute()
 		return;
 	}
 
-	SpawnSavedVehicleSegmentData data = m_data.value();
+	const SpawnSavedVehicleSegmentData& data = m_data.value();
 
 	if (savedCarsCheat->SpawnCar(data.savedCarName)) {
 		ModMenuModule::ToastManager::GetInstance()->Show({ L"Spawned " + data.savedCarName });
diff --git a/src/modules/modmenu/segments/position-menu-segment.cpp b/src/modules/modmenu/segments/position-menu-segment.cpp
index f2a473d..5425acc 100644
--- a/src/modules/modmenu/segments/position-menu-segment.cpp
+++ b/src/modules/modmenu/segments/position-menu-segment.cpp
@@ -161,7 +161,7 @@ bool ModMenuModule::PositionMenuSegment::UpdateTexts()
 		return false;
 	}
 
-	std::wstring modeTextValue = (entry->updateFromPlayerPed) ? L"From player" : L"Custom";
+	std::wstring modeTextValue = (entry->updateFromPlayerPed) ? L"#From player#" : L"#Custom#";
 	std::wstring modeText = m_label + L": " + modeTextValue;
 	m_modeText->SetText(modeText);
 
diff --git a/src/modules/modmenu/segments/position-rotation-menu-segment.cpp b/src/modules/modmenu/segments/position-rotation-menu-segment.cpp
index d3ff445..87d676a 100644
--- a/src/modules/modmenu/segments/position-rotation-menu-segment.cpp
+++ b/src/modules/modmenu/segments/position-rotation-menu-segment.cpp
@@ -162,7 +162,7 @@ bool ModMenuModule::PositionRotationMenuSegment::UpdateTexts()
 		return false;
 	}
 
-	std::wstring modeTextValue = (entry->updateFromPlayerPed) ? L"From player" : L"Custom";
+	std::wstring modeTextValue = (entry->updateFromPlayerPed) ? L"#From player#" : L"#Custom#";
 	std::wstring modeText = m_label + L": " + modeTextValue;
 	m_modeText->SetText(modeText);
 
diff --git a/src/modules/modmenu/segments/spawn-saved-vehicle-segment.cpp b/src/modules/modmenu/segments/spawn-saved-vehicle-segment.cpp
index 0723a58..2396d08 100644
--- a/src/modules/modmenu/segments/spawn-saved-vehicle-segment.cpp
+++ b/src/modules/modmenu/segments/spawn-saved-vehicle-segment.cpp
@@ -16,7 +16,7 @@ bool ModMenuModule::SpawnSavedVehicleSegment::ValidateSegment() const
 {
 	bool hasValue = m_savedCarNameController && m_savedCarNameController->GetValue().has_value();
 	if (!hasValue) {
-		spdlog::warn("No saved vehicles found");
+		spdlog::warn("SpawnSavedVehicleSegment: Validation failed, no saved vehicles found");
 		ToastManager::GetInstance()->Show({ L"No saved vehicles found", ToastType::Warning });
 		return false;
 	}
@@ -26,7 +26,7 @@ bool ModMenuModule::SpawnSavedVehicleSegment::ValidateSegment() const
 	const auto& savedCarNames = savedCarsCheat->GetSavedCarsList();
 
 	if (std::find(savedCarNames.begin(), savedCarNames.end(), savedCarName) == savedCarNames.end()) {
-		spdlog::warn("Selected saved vehicle not found");
+		spdlog::warn(L"SpawnSavedVehicleSegment: Validation failed: Saved vehicle \"{}\" not found", savedCarName);
 		ToastManager::GetInstance()->Show({ L"Selected saved vehicle not found", ToastType::Warning });
 		return false;
 	}