diff --git a/TeXFont_PFB.cpp b/TeXFont_PFB.cpp
index 5d9f5d31d..d6f7d460e 100644
--- a/TeXFont_PFB.cpp
+++ b/TeXFont_PFB.cpp
@@ -83,7 +83,7 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
     kDebug(kvs::dvi) << "Trying to associate glyph indices to names from the encoding vector." << endl;
 #endif
     for(int i=0; i<256; i++) {
-      charMap[i] = FT_Get_Name_Index( face, (FT_String *)(enc->glyphNameVector[i].ascii()) );
+      charMap[i] = FT_Get_Name_Index( face, (FT_String *)(enc->glyphNameVector[i].toAscii().data()) );
 #ifdef DEBUG_PFB
       kDebug(kvs::dvi) << i << ": " << enc->glyphNameVector[i] << ", GlyphIndex=" <<  charMap[i] << endl;
 #endif
diff --git a/psgs.cpp b/psgs.cpp
index d7ddf74ad..3dd32e5d2 100644
--- a/psgs.cpp
+++ b/psgs.cpp
@@ -191,7 +191,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
         // Start page
      << "1 0 bop 0 0 a \n";
 
-  if (PostScriptHeaderString->latin1() != NULL)
+  if (!PostScriptHeaderString->toLatin1().isNull())
     os << PostScriptHeaderString->toLatin1();
 
   if (info->background != Qt::white) {
@@ -202,7 +202,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
     os << colorCommand.toLatin1();
   }
 
-  if (info->PostScriptString->latin1() != NULL)
+  if (!info->PostScriptString->toLatin1().isNull())
     os << info->PostScriptString->toLatin1();
 
   os << "end\n"
diff --git a/special.cpp b/special.cpp
index b81232e49..8d4a657e7 100644
--- a/special.cpp
+++ b/special.cpp
@@ -384,7 +384,7 @@ void dviRenderer::epsf_special(const QString& cp)
     bbox_height *= 0.1 * 65536.0*fontPixelPerDVIunit / shrinkfactor;
 
     QImage image(EPSfilename);
-    image = image.smoothScale((int)(bbox_width), (int)(bbox_height));
+    image = image.scaled((int)(bbox_width), (int)(bbox_height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
     foreGroundPainter->drawImage( ((int) ((currinf.data.dvi_h) / (shrinkfactor * 65536))), currinf.data.pxl_v - (int)bbox_height, image);
     return;
   }