diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeNotFound.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeNotFound.cs
index 942a6db96f..0f3bf5736c 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeNotFound.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Diagram/analysis/NodeNotFound.cs
@@ -24,7 +24,7 @@ public NodeNotFound(string message, Exception innerException) : base(message, in
         {
         }
 
-        protected NodeNotFound(SerializationInfo info, StreamingContext context) : base(info, context)
+        protected NodeNotFound(SerializationInfo info, StreamingContext context)
         {
         }
     }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionRequirementManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionRequirementManager.cs
index 36bb4d5754..93d568cdf7 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionRequirementManager.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Question/QuestionRequirementManager.cs
@@ -8,11 +8,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using CSETWebCore.DataLayer.Model;
-using CSETWebCore.Helpers;
+using Nelibur.ObjectMapper;
 using CSETWebCore.Interfaces.Helpers;
 using CSETWebCore.Interfaces.Question;
 using CSETWebCore.Model.Question;
-using Microsoft.AspNetCore.Http;
 using Snickler.EFCore;
 
 namespace CSETWebCore.Business.Question
@@ -253,7 +252,7 @@ public int StoreAnswer(Answer answer)
                 (answer.QuestionType == "Question" && !_context.NEW_QUESTION.Any(q => q.Question_Id == answer.QuestionId))
                 || (answer.QuestionType == "Requirement" && !_context.NEW_REQUIREMENT.Any(r => r.Requirement_Id == answer.QuestionId))
                 || (answer.QuestionType == "Component" && !_context.COMPONENT_QUESTIONS.Any(c => c.Question_Id == answer.QuestionId))
-                || (answer.QuestionType == "Maturity" && !_context.MATURITY_QUESTIONS.Any(m => m.Mat_Question_Id == answer.QuestionId))               
+                || (answer.QuestionType == "Maturity" && !_context.MATURITY_QUESTIONS.Any(m => m.Mat_Question_Id == answer.QuestionId))
                 )
             {
                 throw new Exception("Unknown question or requirement ID: " + answer.QuestionId);
@@ -324,7 +323,8 @@ public int StoreAnswer(Answer answer)
         /// <param name="resp"></param>        
         public void BuildComponentsResponse(QuestionResponse resp)
         {
-            var list = _context.usp_Answer_Components_Default(this.AssessmentId).Cast<Answer_Components_Base>().ToList();
+            var answerComponents = _context.usp_Answer_Components_Default(this.AssessmentId);
+            var list = answerComponents.Select(component => TinyMapper.Map<Answer_Components_Base>(component)).ToList();
             //.Where(x => x.Assessment_Id == this.assessmentID).Cast<Answer_Components_Base>()
             //.OrderBy(x => x.Question_Group_Heading).ThenBy(x => x.Universal_Sub_Category).ToList();
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReferenceDocumentsController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReferenceDocumentsController.cs
index 4d2fd4ab58..31e1ed9a21 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReferenceDocumentsController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/ReferenceDocumentsController.cs
@@ -11,6 +11,7 @@
 using System.Net.Http.Headers;
 using CSETWebCore.DataLayer.Model;
 using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.AspNetCore.Http;
 
 namespace CSETWebCore.Api.Controllers
 {
@@ -105,7 +106,7 @@ from ft in tt.DefaultIfEmpty()
 
                 var contentDisposition = new ContentDispositionHeaderValue("inline");
                 contentDisposition.FileName = filename;
-                Response.Headers.Add("Content-Disposition", contentDisposition.ToString());
+                Response.Headers.Append("Content-Disposition", contentDisposition.ToString());
 
                 return File(stream, contentType);
             }