diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp
index fe73d9177..f897d7ec9 100644
--- a/obs/obs-app.cpp
+++ b/obs/obs-app.cpp
@@ -171,10 +171,10 @@ bool OBSApp::InitLocale()
 	string path;
 	if (GetDataFilePath(file.str().c_str(), path)) {
 		if (!text_lookup_add(textLookup, path.c_str()))
-			blog(LOG_WARNING, "Failed to add '%s' locale file",
+			blog(LOG_WARNING, "Failed to add locale file '%s'",
 					path.c_str());
 	} else {
-		blog(LOG_WARNING, "Could not find '%s' locale file",
+		blog(LOG_WARNING, "Could not find locale file '%s'",
 				file.str().c_str());
 	}
 
diff --git a/obs/settings-basic-general.cpp b/obs/settings-basic-general.cpp
index 6b97aa9e1..95d756030 100644
--- a/obs/settings-basic-general.cpp
+++ b/obs/settings-basic-general.cpp
@@ -112,11 +112,14 @@ void BasicGenData::Apply()
 		return;
 
 	LanguageInfo *info = static_cast<LanguageInfo*>(
-			window->languageList->GetClientData(sel));
+			window->languageList->GetClientObject(sel));
 
 	config_set_string(GetGlobalConfig(), "General", "Language", info->tag);
 
 	config_save(GetGlobalConfig());
+
+	window->generalChangedText->Hide();
+	dataChanged = false;
 }
 
 BasicSettingsData *CreateBasicGeneralSettings(OBSBasicSettings *window)
diff --git a/obs/settings-basic-video.cpp b/obs/settings-basic-video.cpp
index 86cb89bb6..4d693411b 100644
--- a/obs/settings-basic-video.cpp
+++ b/obs/settings-basic-video.cpp
@@ -398,7 +398,9 @@ void BasicVideoData::Apply()
 	SaveOther();
 	SaveFPSData();
 
+	window->videoChangedText->Hide();
 	config_save(GetGlobalConfig());
+	dataChanged = false;
 }
 
 BasicSettingsData *CreateBasicVideoSettings(OBSBasicSettings *window)
diff --git a/obs/window-settings-basic.cpp b/obs/window-settings-basic.cpp
index b5fe288df..cf294a450 100644
--- a/obs/window-settings-basic.cpp
+++ b/obs/window-settings-basic.cpp
@@ -81,7 +81,7 @@ void OBSBasicSettings::OnClose(wxCloseEvent &event)
 
 void OBSBasicSettings::OKClicked(wxCommandEvent &event)
 {
-	if (settings)
+	if (settings && settings->DataChanged())
 		settings->Apply();
 
 	EndModal(0);
@@ -94,6 +94,6 @@ void OBSBasicSettings::CancelClicked(wxCommandEvent &event)
 
 void OBSBasicSettings::ApplyClicked(wxCommandEvent &event)
 {
-	if (settings)
+	if (settings && settings->DataChanged())
 		settings->Apply();
 }