diff --git a/src/orchestrator/prepare.c b/src/orchestrator/prepare.c
index 40fd279f..cbe0a36f 100644
--- a/src/orchestrator/prepare.c
+++ b/src/orchestrator/prepare.c
@@ -825,12 +825,14 @@ prepareEnvironment(prgset_t *set) {
 
 			if (numa_bitmask_isbitset(con, i)){ // filter by online/existing
 
-				// TODO: use return values for messaging
-				(void)setCPUgovernor(set, i);
+				if (setCPUgovernor(set, i))
+					warn("Could not configure CPU governor. Expect performance loss!");
 
-				(void)adjustCPUfreq(set, i);
+				if (adjustCPUfreq(set, i))
+					warn("Could not configure CPU-frequency. Expect performance loss!");
 
-				(void)setCPUpowerQos(set, i);
+				if (setCPUpowerQos(set, i))
+					warn("Could not configure CPU PM-QoS latency. Expect performance loss!");
 
 				// if smi is set, read SMI counter
 				if(set->smi) {
@@ -970,7 +972,7 @@ prepareEnvironment(prgset_t *set) {
 	if (KV_NOT_SUPPORTED == set->kernelversion)
 		warn("Running on unknown kernel version; Trying generic configuration..");
 
-	if (resetRTthrottle (set, -1)){ // TODO: throttle is limited if no affinity lock is set
+	if (resetRTthrottle (set, -1)){
 		// reset failed, let's try a CGroup reset first?? partitioned should work
 		cont( "trying to reset Docker's CGroups CPU's to %s first", set->affinity);
 		resetContCGroups(set, constr, set->numa);
diff --git a/src/orchestrator/resmgnt.c b/src/orchestrator/resmgnt.c
index 0095ac83..a8003c20 100644
--- a/src/orchestrator/resmgnt.c
+++ b/src/orchestrator/resmgnt.c
@@ -665,7 +665,7 @@ resetRTthrottle (prgset_t *set, int percent){
 	char buf[20];	// temporary stack buffer
 
 	// all modes except  Dynamic, set to -1 = unconstrained
-	if (-1 == percent){
+	if (-1 == percent){ // TODO: throttle is limited if no affinity lock is set
 		cont( "Set real-time bandwidth limit to (unconstrained)..");
 		value = RTLIM_UNL;
 	}