diff --git a/src/eepp/system/process.cpp b/src/eepp/system/process.cpp
index 886bcb9ed..631808aee 100644
--- a/src/eepp/system/process.cpp
+++ b/src/eepp/system/process.cpp
@@ -270,11 +270,11 @@ bool Process::kill() {
 	mShuttingDown = true;
 	subprocess_init_shutdown( PROCESS_PTR );
 	if ( PROCESS_PTR->alive ) {
+		int ret = subprocess_terminate( PROCESS_PTR );
 		destroy();
-		int ret = 0 == subprocess_terminate( PROCESS_PTR );
 		eeSAFE_FREE( mProcess );
 		mKilled = true;
-		return ret;
+		return 0 == ret;
 	}
 	return false;
 }
diff --git a/src/thirdparty/subprocess/subprocess.h b/src/thirdparty/subprocess/subprocess.h
index 0d1d61f52..7364f4548 100644
--- a/src/thirdparty/subprocess/subprocess.h
+++ b/src/thirdparty/subprocess/subprocess.h
@@ -438,7 +438,7 @@ wchar_t* Utf8ToUtf16_C( const char* utf8Str ) {
 		utf8Str,
 		-1,
 		NULL,
-		0	
+		0
 	);
 
 	if ( wideCharCount == 0 ) {
@@ -896,7 +896,7 @@ int subprocess_create_ex(const char *const commandLine[], int options,
 	  free( working_directoryW );
     return -1;
   }
-  
+
   free( commandLineCombinedW );
   free( used_environment );
   free( working_directoryW );
diff --git a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
index 74305814b..f89b2ee83 100644
--- a/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
+++ b/src/tools/ecode/plugins/lsp/lspclientplugin.cpp
@@ -1080,7 +1080,7 @@ void LSPClientPlugin::loadLSPConfig( std::vector<LSPDefinition>& lsps, const std
 		auto list = { "lsp-go-to-definition",
 					  "lsp-go-to-declaration",
 					  "lsp-go-to-implementation",
-					  "lspz-go-to-type-definition",
+					  "lsp-go-to-type-definition",
 					  "lsp-switch-header-source",
 					  "lsp-symbol-info",
 					  "lsp-symbol-references",
diff --git a/src/tools/ecode/settingsmenu.cpp b/src/tools/ecode/settingsmenu.cpp
index 98a8d7758..eec714c07 100644
--- a/src/tools/ecode/settingsmenu.cpp
+++ b/src/tools/ecode/settingsmenu.cpp
@@ -2373,17 +2373,6 @@ void SettingsMenu::createProjectTreeMenu( const FileInfo& file ) {
 				   findIcon( "folder-open" ) )
 			->setId( "open_all_files_in_folder" );
 	} else {
-		if ( file.isRegularFile() ) {
-			auto curDir( mApp->getCurrentWorkingDir() );
-			FileSystem::dirAddSlashAtEnd( curDir );
-			if ( curDir == file.getDirectoryPath() ) {
-				mProjectTreeMenu
-					->add( i18n( "new_file_in_file_folder_ellipsis", "New File in File Folder..." ),
-						   findIcon( "file-add" ) )
-					->setId( "new_file" );
-			}
-		}
-
 		mProjectTreeMenu->add( i18n( "open_file", "Open File" ), findIcon( "document-open" ) )
 			->setId( "open_file" );
 		mProjectTreeMenu