diff --git a/gfx/src/photon/nsDeviceContextSpecPh.cpp b/gfx/src/photon/nsDeviceContextSpecPh.cpp
index 5790782c1082..20f6838f3e94 100644
--- a/gfx/src/photon/nsDeviceContextSpecPh.cpp
+++ b/gfx/src/photon/nsDeviceContextSpecPh.cpp
@@ -208,15 +208,16 @@ NS_IMETHODIMP nsPrinterEnumeratorPh::GetDefaultPrinterName(PRUnichar * *aDefault
 
   NS_ENSURE_ARG_POINTER(aDefaultPrinterName);
 
+	*aDefaultPrinterName = nsnull;
+
 	PpPrintContext_t *pc = PpCreatePC();
 	if( pc ) {
 		PpLoadDefaultPrinter( pc );
 		PpGetPC( pc, Pp_PC_NAME, &printer );
-
-  	*aDefaultPrinterName = ToNewUnicode( NS_LITERAL_STRING( printer ) );
+  	if( printer ) *aDefaultPrinterName = ToNewUnicode( NS_LITERAL_STRING( printer ) );
 		PpReleasePC( pc );
 		}
-	else *aDefaultPrinterName = nsnull;
+
   return NS_OK;
 }
 
diff --git a/gfx/src/photon/nsRenderingContextPh.cpp b/gfx/src/photon/nsRenderingContextPh.cpp
index fdf7fd45e43a..9db2a6fe96db 100644
--- a/gfx/src/photon/nsRenderingContextPh.cpp
+++ b/gfx/src/photon/nsRenderingContextPh.cpp
@@ -844,7 +844,7 @@ NS_IMETHODIMP nsRenderingContextPh::DrawString(const char *aString, PRUint32 aLe
       nscoord yy = y;
       mTranMatrix->TransformCoord(&xx, &yy);
       PhPoint_t pos = { xx, yy };
-			PgDrawText( ch, charlen, &pos, Pg_TEXT_LEFT);
+			PgDrawTextCx( mSurfaceDC, ch, charlen, &pos, Pg_TEXT_LEFT);
 			x += *aSpacing++;
 			}
 		}