diff --git a/src/app/platform_includes/includesWindows.h b/src/app/platform_includes/includesWindows.h
index 808848d5..2d1c99be 100644
--- a/src/app/platform_includes/includesWindows.h
+++ b/src/app/platform_includes/includesWindows.h
@@ -5,7 +5,7 @@
 
 #include "vld.h"
 
-#define DEPLOY
+//#define DEPLOY
 
 #ifdef DEPLOY
 	static std::string appSettingsPath = std::string(std::getenv("APPDATA")) + "/../local/Coati Software/Coati/ApplicationSettings.xml";
diff --git a/src/lib/data/parser/cxx/ASTVisitor.cpp b/src/lib/data/parser/cxx/ASTVisitor.cpp
index 1414a438..7de6d0c7 100644
--- a/src/lib/data/parser/cxx/ASTVisitor.cpp
+++ b/src/lib/data/parser/cxx/ASTVisitor.cpp
@@ -458,14 +458,11 @@ bool ASTVisitor::VisitFunctionTemplateDecl(clang::FunctionTemplateDecl *declarat
 		for (size_t i = 0; i < parameterList->size(); i++)
 		{
 			clang::NamedDecl* namedDecl = parameterList->getParam(i);
-
-			if (isLocatedInUnparsedProjectFile(namedDecl))
+			if (!namedDecl->getName().empty()) // do not create node for template param if the param has no name
 			{
-				NameHierarchy templateParameterTypeNameHierarchy = utility::getDeclNameHierarchy(namedDecl);
-
 				m_client->onTemplateFunctionParameterTypeParsed(
 					getParseLocationForNamedDecl(namedDecl),
-					templateParameterTypeNameHierarchy,
+					utility::getDeclNameHierarchy(namedDecl),
 					templateFunction
 				);
 			}
@@ -915,6 +912,7 @@ ParseLocation ASTVisitor::getParseLocationForIdentifier(const clang::SourceLocat
 		tokenKind != clang::tok::TokenKind::raw_identifier
 	)
 	{
+		const clang::PresumedLoc& presumedEndss = sourceManager.getPresumedLoc(identifierToken.getEndLoc());
 		clang::Lexer::getRawToken(identifierToken.getEndLoc(), identifierToken, sourceManager, clang::LangOptions());
 		tokenKind = identifierToken.getKind();
 	}