diff --git a/veejay-current/veejay-server/libel/avhelper.c b/veejay-current/veejay-server/libel/avhelper.c
index 31fa63b7..36514ac8 100644
--- a/veejay-current/veejay-server/libel/avhelper.c
+++ b/veejay-current/veejay-server/libel/avhelper.c
@@ -188,7 +188,7 @@ int avhelper_set_num_decoders() {
     }
     else {
         veejay_msg(VEEJAY_MSG_DEBUG, "env VEEJAY_NUM_DECODE_THREADS not set!");
-		int n = task_num_cpus();
+		int n = vj_task_get_num_cpus();
 		if( n > 1 )
 			n_threads = 2;
 		if( n > 3 )
diff --git a/veejay-current/veejay-server/veejay/liblavplayvj.c b/veejay-current/veejay-server/veejay/liblavplayvj.c
index f728bed9..812ad256 100644
--- a/veejay-current/veejay-server/veejay/liblavplayvj.c
+++ b/veejay-current/veejay-server/veejay/liblavplayvj.c
@@ -379,8 +379,6 @@ int veejay_free(veejay_t * info)
 
     veejay_playback_close(info);
 
-	vj_mem_threaded_stop();
-
 	vj_event_destroy(info);
 
 	vj_tag_free();
@@ -3055,7 +3053,7 @@ int veejay_main(veejay_t * info)
     	/* Flush the Linux File buffers to disk */
     	//sync();
    
-	if( task_num_cpus() > 1 ) {
+	if( vj_task_get_num_cpus() > 1 ) {
 		CPU_ZERO( &cpuset );
 		CPU_SET ( 0, &cpuset ); /* run on the first cpu */
 
diff --git a/veejay-current/veejay-server/veejay/veejay.c b/veejay-current/veejay-server/veejay/veejay.c
index ccf871e6..6a3f328e 100644
--- a/veejay-current/veejay-server/veejay/veejay.c
+++ b/veejay-current/veejay-server/veejay/veejay.c
@@ -838,7 +838,6 @@ int main(int argc, char **argv)
 	
 	info = veejay_malloc();
 	if (!info) {
-		vj_mem_threaded_stop();
 		return 1;
 	}