diff --git a/bin/app/user/projects/tictactoe/src/tictactoe.cpp b/bin/app/user/projects/tictactoe/src/tictactoe.cpp
index d21a1025..b4ba8ef1 100644
--- a/bin/app/user/projects/tictactoe/src/tictactoe.cpp
+++ b/bin/app/user/projects/tictactoe/src/tictactoe.cpp
@@ -13,6 +13,7 @@ TicTacToe::~TicTacToe() {
 	Reset();
 }
 
+
 bool TicTacToe::Start() {
 	Reset();
 	io::stringOut("Tic Tac Toe\n\n[1] Human\n[2] Computer\n[3] Quit\n\n");
diff --git a/src/lib/project/Project.cpp b/src/lib/project/Project.cpp
index 6eeae51c..fca8dfde 100644
--- a/src/lib/project/Project.cpp
+++ b/src/lib/project/Project.cpp
@@ -140,6 +140,11 @@ bool Project::refresh(bool forceRefresh)
 		}
 	}
 
+	if (!m_sourceGroups.empty())
+	{
+		NameHierarchy::setDelimiter(getSymbolNameDelimiterForLanguage(m_sourceGroups.front()->getLanguage()));
+	}
+
 	if (requestIndex(forceRefresh, needsFullRefresh))
 	{
 		m_storageAccessProxy->setSubject(m_storage.get());
diff --git a/src/lib_gui/qt/element/QtCodeNavigator.cpp b/src/lib_gui/qt/element/QtCodeNavigator.cpp
index e38bacc8..8e23842b 100644
--- a/src/lib_gui/qt/element/QtCodeNavigator.cpp
+++ b/src/lib_gui/qt/element/QtCodeNavigator.cpp
@@ -660,7 +660,10 @@ void QtCodeNavigator::requestScroll(const FilePath& filePath, uint lineNumber, I
 	// std::cout << "scroll request: " << req.filePath.str() << " " << req.lineNumber << " " << req.locationId;
 	// std::cout << " " << req.animated << " " << req.onTop << std::endl;
 
-	m_scrollRequest = req;
+	if ((!m_scrollRequest.lineNumber || !m_scrollRequest.locationId) && (req.lineNumber || req.locationId))
+	{
+		m_scrollRequest = req;
+	}
 
 	m_singleHasNewFile = false;
 }