diff --git a/aegisub/dialog_kanji_timer.h b/aegisub/dialog_kanji_timer.h
index 86a99a81b..1043fdb7f 100644
--- a/aegisub/dialog_kanji_timer.h
+++ b/aegisub/dialog_kanji_timer.h
@@ -67,7 +67,7 @@ private:
 
 	wxString TextBeforeKaraoke;
 	wxString *RegroupSourceText, *RegroupGroups;
-	std::vector<std::pair<int,wxString>> LinesToChange;
+	std::vector<std::pair<int,wxString> > LinesToChange;
 	int *RegroupSourceKLengths;
 	int RegroupSourceSelected, RegroupTotalLen;
 	int SourceIndex, DestIndex;
diff --git a/aegisub/dialog_style_editor.cpp b/aegisub/dialog_style_editor.cpp
index 66f5e77b5..dc4ed1f28 100644
--- a/aegisub/dialog_style_editor.cpp
+++ b/aegisub/dialog_style_editor.cpp
@@ -367,7 +367,7 @@ void DialogStyleEditor::Apply (bool apply,bool close) {
 		}
 
 		// Style name change
-		if (work->name != newStyleName) {
+		if (work->name != newStyleName && !work->name.StartsWith(_("Copy of "))) {
 			// See if user wants to update style name through script
 			int answer = wxNO;
 			if (work->name != _T("Default")) answer = wxMessageBox(_T("Do you want to change all instances of this style in the script to this new name?"),_T("Update script?"),wxYES_NO | wxCANCEL);
diff --git a/aegisub/dialog_style_manager.cpp b/aegisub/dialog_style_manager.cpp
index ad8287a88..ee3125209 100644
--- a/aegisub/dialog_style_manager.cpp
+++ b/aegisub/dialog_style_manager.cpp
@@ -568,6 +568,7 @@ void DialogStyleManager::OnCopyToCurrent (wxCommandEvent &event) {
 // Storage make copy
 void DialogStyleManager::OnStorageCopy (wxCommandEvent &event) {
 	wxArrayInt selections;
+	StorageList->GetSelections(selections);
 	AssStyle *temp = new AssStyle;
 
 	*temp = *(styleStorageMap.at(selections[0]));
@@ -592,6 +593,7 @@ void DialogStyleManager::OnStorageCopy (wxCommandEvent &event) {
 // Current make copy
 void DialogStyleManager::OnCurrentCopy (wxCommandEvent &event) {
 	wxArrayInt selections;
+	CurrentList->GetSelections(selections);
 
 	AssStyle *temp = new AssStyle(styleMap.at(selections[0])->GetEntryData());
 	wxString newName = _("Copy of ");
@@ -616,7 +618,6 @@ void DialogStyleManager::OnCurrentCopy (wxCommandEvent &event) {
 ///////////////
 // Storage new
 void DialogStyleManager::OnStorageNew (wxCommandEvent &event) {
-	wxArrayInt selections;
 	AssStyle *temp = new AssStyle;
 
 	DialogStyleEditor editor(this,temp,grid);
@@ -634,7 +635,6 @@ void DialogStyleManager::OnStorageNew (wxCommandEvent &event) {
 ///////////////
 // Current new
 void DialogStyleManager::OnCurrentNew (wxCommandEvent &event) {
-	wxArrayInt selections;
 	AssStyle *temp = new AssStyle;
 
 	DialogStyleEditor editor(this,temp,grid);