diff --git a/library/rsa.c b/library/rsa.c
index fa6a3f308..3bc05b32f 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -398,12 +398,9 @@ int rsa_private( rsa_context *ctx,
     mpi *DQ = &ctx->DQ;
 #endif
 
-    mpi_init( &T ); mpi_init( &T1 ); mpi_init( &T2 );
-
     mpi_init( &T ); mpi_init( &T1 ); mpi_init( &T2 );
     mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &R );
 
-
     if( f_rng != NULL )
     {
 #if defined(POLARSSL_RSA_NO_CRT)
@@ -414,9 +411,8 @@ int rsa_private( rsa_context *ctx,
 #endif
     }
 
-
 #if defined(POLARSSL_THREADING_C)
-    if( ( ret = mutex_lock( &ctx->mutex ) ) != 0 )
+    if( ( ret = polarssl_mutex_lock( &ctx->mutex ) ) != 0 )
         return( ret );
 #endif