diff --git a/kms/CMakeLists.txt b/kms/CMakeLists.txt
index 941dfb979c..eba13de4ab 100644
--- a/kms/CMakeLists.txt
+++ b/kms/CMakeLists.txt
@@ -432,6 +432,12 @@ if(CMAKE_HOST_WIN32)
 	set_target_properties(kms
     	PROPERTIES
     		COMPILE_OPTIONS "/bigobj")
+elseif(CMAKE_HOST_APPLE)
+	MESSAGE(STATUS "kms: include & link for MACOS")
+	target_include_directories(kms
+			PRIVATE /usr/local/include)
+	target_link_libraries(kms
+			/usr/local/lib/libjsoncpp.dylib)
 else()
 	target_include_directories(kms
 		PRIVATE /usr/include/jsoncpp)
diff --git a/kms/src/model/CreateCertificateRequest.cc b/kms/src/model/CreateCertificateRequest.cc
index 4aeef2ee66..de9e3816d4 100644
--- a/kms/src/model/CreateCertificateRequest.cc
+++ b/kms/src/model/CreateCertificateRequest.cc
@@ -76,6 +76,6 @@ std::map<std::string, std::string> CreateCertificateRequest::getSubjectAlternati
 
 void CreateCertificateRequest::setSubjectAlternativeNames(std::map<std::string, std::string> subjectAlternativeNames) {
   subjectAlternativeNames_ = subjectAlternativeNames;
-  setParameter(std::string("SubjectAlternativeNames"), subjectAlternativeNames);
+  setJsonParameters(std::string("SubjectAlternativeNames"), subjectAlternativeNames);
 }