diff --git a/libretro-common/libco/scefiber.c b/libretro-common/libco/scefiber.c
index bd95947417..af06ba35e8 100644
--- a/libretro-common/libco/scefiber.c
+++ b/libretro-common/libco/scefiber.c
@@ -37,7 +37,7 @@ void co_thunk(uint32_t argOnInitialize, uint32_t argOnRun)
 cothread_t co_active(void)
 {
    if(!co_active_)
-   {	
+   {
 		  sceSysmoduleLoadModule(SCE_SYSMODULE_FIBER);
       co_active_ = (cothread_t)1;
    }
@@ -53,7 +53,7 @@ cothread_t co_create(unsigned int heapsize, void (*coentry)(void))
       sceSysmoduleLoadModule(SCE_SYSMODULE_FIBER);
       co_active_ = (cothread_t)1;
    }
-   
+
    //_sceFiberInitializeImpl
    int ret = _sceFiberInitializeImpl(tailFiber, "tailFiber", co_thunk, (uint32_t)coentry, (void*) m_contextBuffer, 10000, NULL);
    if(ret==0){
@@ -71,7 +71,7 @@ void co_delete(cothread_t cothread)
 
 void co_switch(cothread_t cothread)
 {
-  
+
    uint32_t argOnReturn = 0;
    if(cothread == (cothread_t)1){
      co_active_ = cothread;
@@ -79,11 +79,12 @@ void co_switch(cothread_t cothread)
    }else{
 		 SceFiber* theFiber = (SceFiber*)cothread;
 		 if(co_active_ == (cothread_t)1){
+			 co_active_ = cothread;
 			 sceFiberRun(theFiber, 0, &argOnReturn);
 		 }else{
+			 co_active_ = cothread;
 			 sceFiberSwitch(theFiber, 0, &argOnReturn);
 		 }
-     co_active_ = cothread;
    }
 }
 
diff --git a/libretro-common/rthreads/psp_pthread.h b/libretro-common/rthreads/psp_pthread.h
index 28a4d5ac2a..e08e86b6b7 100644
--- a/libretro-common/rthreads/psp_pthread.h
+++ b/libretro-common/rthreads/psp_pthread.h
@@ -118,7 +118,6 @@ static INLINE int pthread_mutex_lock(pthread_mutex_t *mutex)
 {
 #ifdef VITA
 	 int ret = sceKernelLockMutex(*mutex, 1, 0);
-	 //sceClibPrintf("pthread_mutex_lock: %x\n",ret);
 	 return ret;
 
 #else
@@ -131,7 +130,6 @@ static INLINE int pthread_mutex_unlock(pthread_mutex_t *mutex)
 {
 #ifdef VITA
 	int ret = sceKernelUnlockMutex(*mutex, 1);
-	//sceClibPrintf("pthread_mutex_unlock: %x\n",ret);
 	return ret;
 #else
    /* FIXME: stub */
@@ -221,27 +219,25 @@ static INLINE int pthread_cond_init(pthread_cond_t *cond,
       const pthread_condattr_t *attr)
 {
 #ifdef VITA
-  
+
 	pthread_mutex_init(&cond->mutex,NULL);
-	sceClibPrintf("pthread_cond_init: mutex %x\n",cond->mutex);
   if(cond->mutex<0){
     return cond->mutex;
 	}
   sprintf(name_buffer, "0x%08X", (uint32_t) cond);
   //cond->sema = sceKernelCreateCond(name_buffer, 0, cond->mutex, 0);
 	cond->sema = sceKernelCreateSema(name_buffer, 0, 0, 1, 0);
-	sceClibPrintf("pthread_cond_init: sema %x\n",cond->sema);
 	if(cond->sema<0){
 		pthread_mutex_destroy(&cond->mutex);
   	return cond->sema;
 	}
-	
+
 	cond->waiting = 0;
 
-	
+
 	return 0;
-	
-	
+
+
 #else
    /* FIXME: stub */
    return 1;
@@ -256,7 +252,6 @@ static INLINE int pthread_cond_signal(pthread_cond_t *cond)
    {
 		--cond->waiting;
 		int ret = sceKernelSignalSema(cond->sema, 1);
-		sceClibPrintf("pthread_cond_signal: %x\n",ret);
 	}
 	pthread_mutex_unlock(&cond->mutex);
 	return 0;