diff --git a/base_c/src/core_set.c b/base_c/src/core_set.c
index 2671dc7..ede74a2 100644
--- a/base_c/src/core_set.c
+++ b/base_c/src/core_set.c
@@ -127,7 +127,7 @@ void embb_core_set_init(embb_core_set_t* core_set, int initializer) {
 
 #ifdef EMBB_PLATFORM_THREADING_RTOSTASKS
 #ifdef __TriCore__
-#define CORE_COUNT 3 //scm34681: 3
+#define CORE_COUNT 3
 #endif
 
 
diff --git a/base_c/src/log.c b/base_c/src/log.c
index f999203..9a4807b 100644
--- a/base_c/src/log.c
+++ b/base_c/src/log.c
@@ -32,6 +32,7 @@
 #include <embb/base/c/log.h>
 
 #include <embb/base/c/internal/config.h>
+#include <embb/base/c/internal/unused.h>
 
 void embb_log_write_file(
   void * context,
@@ -103,6 +104,9 @@ void embb_log_write_internal(
     embb_log_global_log_function(log_context, buffer);
 #elif defined(EMBB_PLATFORM_COMPILER_GNUC)
 #if defined(EMBB_OS_FREERTOS)
+	EMBB_UNUSED(log_level_str);
+	EMBB_UNUSED(message);
+	EMBB_UNUSED(argp);
 #else
     char msg_buffer[400];
     char buffer[500];
diff --git a/base_c/src/mutex.c b/base_c/src/mutex.c
index 3471d9c..768664b 100644
--- a/base_c/src/mutex.c
+++ b/base_c/src/mutex.c
@@ -163,7 +163,7 @@ int embb_mutex_init(embb_mutex_t* mutex, int type) {
 	* but queue.c...
 	*/
 	/*if(type == EMBB_MUTEX_PLAIN) {
-		mutex = xSemaphoreCreateMutex();
+		*mutex = xSemaphoreCreateMutex();
 	}
 	else {
 		assert(type == EMBB_MUTEX_RECURSIVE);*/
@@ -209,7 +209,7 @@ int embb_mutex_unlock(embb_mutex_t* mutex) {
 
 void embb_mutex_destroy(embb_mutex_t* mutex) {
 	assert(NULL != mutex);
-	vSemaphoreDelete(mutex);
+	vSemaphoreDelete(*mutex);
 }
 
 
diff --git a/base_c/src/thread.c b/base_c/src/thread.c
index 5aaf003..d67024a 100644
--- a/base_c/src/thread.c
+++ b/base_c/src/thread.c
@@ -364,7 +364,7 @@ embb_thread_start_t func, void *arg) {
 	thread->embb_internal_arg->func = func;
 	thread->embb_internal_arg->arg = arg;	  						
 						
-	status =  TaskCreateWithCoreSet(
+	status =  core_set_create_task(
 					(TaskFunction_t) embb_internal_thread_start, 			// entry function
 					500, 													// stack depth
 					rtos_core_set,											// core set
diff --git a/partest.tar b/partest.tar
index 5d4fa13..76282d1 100644
Binary files a/partest.tar and b/partest.tar differ