diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index ccef828bd..aa94e4e9a 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -948,10 +948,9 @@ void DiabloInit()
 
 	for (size_t i = 0; i < QUICK_MESSAGE_OPTIONS; i++) {
 		auto &messages = sgOptions.Chat.szHotKeyMsgs[i];
-		if (messages.size() > 0) {
-			continue;
+		if (messages.empty()) {
+			messages.emplace_back(_(QuickMessages[i].message));
 		}
-		messages.emplace_back(_(QuickMessages[i].message));
 	}
 
 #ifndef USE_SDL1
diff --git a/Source/options.cpp b/Source/options.cpp
index 4970d268b..c0a0bc658 100644
--- a/Source/options.cpp
+++ b/Source/options.cpp
@@ -411,7 +411,7 @@ OptionEntryFlags OptionEntryBase::GetFlags() const
 }
 void OptionEntryBase::SetValueChangedCallback(std::function<void()> callback)
 {
-	this->callback = callback;
+	this->callback = std::move(callback);
 }
 void OptionEntryBase::NotifyValueChanged()
 {
diff --git a/Source/options.h b/Source/options.h
index 9176233a4..03e8a6e60 100644
--- a/Source/options.h
+++ b/Source/options.h
@@ -12,7 +12,7 @@
 namespace devilution {
 
 enum class StartUpGameMode {
-	/** @brief If hellfire is present, asks the user what game he wants to start. */
+	/** @brief If hellfire is present, asks the user what game they want to start. */
 	Ask = 0,
 	Hellfire = 1,
 	Diablo = 2,