diff --git a/generators/dvi/kvs_debug.h b/generators/dvi/kvs_debug.h
index 3242d505b..96e58d6bf 100644
--- a/generators/dvi/kvs_debug.h
+++ b/generators/dvi/kvs_debug.h
@@ -16,6 +16,6 @@ namespace kvs
 {
    static const int dvi = 4650;
    static const int shell = 4650;
-};
+}
 
 #endif
diff --git a/generators/xps/generator_xps.cpp b/generators/xps/generator_xps.cpp
index 473edc5c0..6ec205a7d 100644
--- a/generators/xps/generator_xps.cpp
+++ b/generators/xps/generator_xps.cpp
@@ -30,7 +30,7 @@
 #include "core/page.h"
 #include "generator_xps.h"
 
-OKULAR_EXPORT_PLUGIN(XpsGenerator);
+OKULAR_EXPORT_PLUGIN(XpsGenerator)
 
 
 XpsPage::XpsPage(KZip *archive, const QString &fileName)
@@ -115,12 +115,12 @@ XpsPage* XpsDocument::page(int pageNum) const
 
 XpsFile::XpsFile() : m_docInfo( 0 )
 {
-};
+}
 
 
 XpsFile::~XpsFile()
 {
-};
+}
 
 
 bool XpsFile::loadDocument(const QString &filename)
diff --git a/ui/pagepainter.cpp b/ui/pagepainter.cpp
index a99925edc..d17f6e238 100644
--- a/ui/pagepainter.cpp
+++ b/ui/pagepainter.cpp
@@ -12,6 +12,7 @@
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qimage.h>
+#include <qvarlengtharray.h>
 #include <qapplication.h>
 #include <kglobal.h>
 #include <kimageeffect.h>
@@ -660,7 +661,7 @@ void PagePainter::scalePixmapOnImage ( QImage & dest, const QPixmap * src,
     unsigned int * srcData = (unsigned int *)srcImage.bits();
 
     // precalc the x correspondancy conversion in a lookup table
-    unsigned int xOffset[ destWidth ];
+    QVarLengthArray<unsigned int> xOffset( destWidth );
     for ( int x = 0; x < destWidth; x++ )
         xOffset[ x ] = ((x + destLeft) * srcWidth) / scaledWidth;