diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index 2e38c7664..0b800a27a 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -3893,7 +3893,7 @@ void NppParameters::feedScintillaParam(TiXmlNode *node)
 	nm = element->Attribute(TEXT("borderWidth"), &val);
 	if (nm)
 	{
-		if (val > 0 || val <= 30)
+		if (val >= 0 && val <= 30)
 			_svp._borderWidth = val;
 	}
 }
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
index 0caa288f9..fbd737680 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
@@ -2264,7 +2264,11 @@ pair<int, int> ScintillaEditView::getSelectionLinesRange() const
     range.first = execute(SCI_LINEFROMPOSITION, start);
     range.second = execute(SCI_LINEFROMPOSITION, end);
     if (range.first > range.second)
-        range.swap(range);
+	{
+		int temp = range.first;
+		range.first = range.second;
+		range.second = temp;
+	}
     return range;
 }