diff --git a/packages/salesforcedx-vscode-apex/src/oas/documentProcessorPipeline/methodValidationStep.ts b/packages/salesforcedx-vscode-apex/src/oas/documentProcessorPipeline/methodValidationStep.ts
index 4074829632..270d3e7b14 100644
--- a/packages/salesforcedx-vscode-apex/src/oas/documentProcessorPipeline/methodValidationStep.ts
+++ b/packages/salesforcedx-vscode-apex/src/oas/documentProcessorPipeline/methodValidationStep.ts
@@ -11,19 +11,18 @@ import { nls } from '../../messages';
 import { ApexClassOASEligibleResponse, OpenAPIDoc } from '../schemas';
 import { ProcessorInputOutput, ProcessorStep } from './processorStep';
 export class MethodValidationStep implements ProcessorStep {
-  private diagnosticCollection: vscode.DiagnosticCollection;
+  static diagnosticCollection: vscode.DiagnosticCollection =
+    vscode.languages.createDiagnosticCollection('OAS Method Validations');
   private className: string = '';
   private virtualUri: vscode.Uri | null = null; // the url of the virtual YAML file
   private diagnostics: vscode.Diagnostic[] = [];
-  constructor() {
-    this.diagnosticCollection = vscode.languages.createDiagnosticCollection('OAS Method Validations');
-  }
+  constructor() {}
   process(input: ProcessorInputOutput): Promise<ProcessorInputOutput> {
-    this.className = input.context.classDetail.name;
+    this.className = input.context.classDetail.name as string;
     this.virtualUri = vscode.Uri.parse(`untitled:${this.className}_OAS_temp.yaml`);
-    this.diagnosticCollection.clear();
+    MethodValidationStep.diagnosticCollection.clear();
     const cleanedupYaml = this.validateMethods(input.yaml, input.eligibilityResult);
-    this.diagnosticCollection.set(this.virtualUri, this.diagnostics);
+    MethodValidationStep.diagnosticCollection.set(this.virtualUri, this.diagnostics);
     input.errors = [...input.errors, ...this.diagnostics];
     return new Promise(resolve => {
       resolve({ ...input, yaml: cleanedupYaml });
diff --git a/packages/salesforcedx-vscode-apex/src/oas/generationStrategy/methodByMethodStrategy.ts b/packages/salesforcedx-vscode-apex/src/oas/generationStrategy/methodByMethodStrategy.ts
index a8fdcb6e16..d41ce36eb5 100644
--- a/packages/salesforcedx-vscode-apex/src/oas/generationStrategy/methodByMethodStrategy.ts
+++ b/packages/salesforcedx-vscode-apex/src/oas/generationStrategy/methodByMethodStrategy.ts
@@ -86,7 +86,7 @@ export class MethodByMethodStrategy extends GenerationStrategy {
 
     for (const doc of docs) {
       const yamlCleanDoc = this.cleanYamlString(doc);
-      const parsed = parse(yamlCleanDoc) as OpenAPIV3.Document;
+      const parsed = yaml.parse(yamlCleanDoc) as OpenAPIV3.Document;
       // Merge paths
       if (parsed.paths) {
         for (const [path, methods] of Object.entries(parsed.paths)) {