diff --git a/src/plugins/clangcodemodel/clangfollowsymbol.cpp b/src/plugins/clangcodemodel/clangfollowsymbol.cpp
index 6611b66d82f..3e85ebc8d93 100644
--- a/src/plugins/clangcodemodel/clangfollowsymbol.cpp
+++ b/src/plugins/clangcodemodel/clangfollowsymbol.cpp
@@ -85,10 +85,10 @@ static int includePathStartIndex(const QVector<ClangBackEnd::TokenInfoContainer>
 }
 
 static int includePathEndIndex(const QVector<ClangBackEnd::TokenInfoContainer> &marks,
-                                 int currentIndex)
+                               int currentIndex)
 {
     int endIndex = currentIndex + 1;
-    while (isValidIncludePathToken(marks[endIndex]))
+    while (endIndex < marks.size() && isValidIncludePathToken(marks[endIndex]))
         ++endIndex;
     return endIndex - 1;
 }
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index 2825ec3ac0a..73e619dbad4 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -39,6 +39,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id)
     auto libAspect = addAspect<QtLibPathAspect>();
     libAspect->setSettingsKey("Qt4ProjectManager.QnxRunConfiguration.QtLibPath");
     libAspect->setLabelText(tr("Path to Qt libraries on device"));
+    libAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
 }
 
 Runnable QnxRunConfiguration::runnable() const