diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a0f3e10..73c46d5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,8 @@ enable_testing()
 
 # config.h include path
 include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/src/lib/slot_mgr)
+include_directories(${CMAKE_SOURCE_DIR}/src/lib/object_store)
 
 add_subdirectory(src)
 
diff --git a/cmake/modules/CompilerOptions.cmake b/cmake/modules/CompilerOptions.cmake
index 151166d3..f963b65e 100644
--- a/cmake/modules/CompilerOptions.cmake
+++ b/cmake/modules/CompilerOptions.cmake
@@ -219,6 +219,10 @@ if(WITH_CRYPTO_BACKEND STREQUAL "botan")
         message(STATUS "Botan: Support for EDDSA is disabled")
     endif(ENABLE_EDDSA)
 
+    if(ENABLE_MLDSA)
+        set(WITH_ML_DSA 1)
+    endif(ENABLE_MLDSA)
+
     # acx_botan_gost.m4
     if(ENABLE_GOST)
         set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_botan_gost.cpp)
@@ -370,6 +374,10 @@ elseif(WITH_CRYPTO_BACKEND STREQUAL "openssl")
         message(STATUS "OpenSSL: Support for EDDSA is disabled")
     endif(ENABLE_EDDSA)
 
+    if(ENABLE_MLDSA)
+        set(WITH_ML_DSA 1)
+    endif(ENABLE_MLDSA)
+
     # acx_openssl_gost.m4
     if(ENABLE_GOST)
         set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_openssl_gost.c)
diff --git a/src/lib/P11Attributes.cpp b/src/lib/P11Attributes.cpp
index c9603bf9..887870cb 100644
--- a/src/lib/P11Attributes.cpp
+++ b/src/lib/P11Attributes.cpp
@@ -440,8 +440,11 @@ CK_RV P11Attribute::update(Token* token, bool isPrivate, CK_VOID_PTR pValue, CK_
 	{
 		if (OBJECT_OP_GENERATE==op)
 		{
-			ERROR_MSG("Prohibited attribute was passed to key generation function");
-			return CKR_ATTRIBUTE_READ_ONLY;
+            if (type != CKA_PARAMETER_SET) 
+            {
+                ERROR_MSG("Prohibited attribute was passed to key generation function");
+                return CKR_ATTRIBUTE_READ_ONLY;
+            }
 		}
 	}
 
@@ -2593,4 +2596,4 @@ CK_RV P11AttrSeed::updateAttr(Token *token, bool isPrivate, CK_VOID_PTR pValue,
 	osobject->setAttribute(type, value);
 
 	return CKR_OK;
-}
\ No newline at end of file
+}