diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-18    <guravage@caterpie.sen.cwi.nl>
 
+	* mainbase.cpp (Save): QDir::toNativeSeparators(fname). Invoke
+	save with format argument set to zero to force QImage to guess the
+	format by looking at fileName's suffix.
+
+	* VirtualLeaf-install.nsi: Put uninstaller in top directory.
+
 	* VirtualLeaf.pro: MAXOSX, look for gpl3.txt in the ../doc directory.
 
 	* Makefile (Makefile.libplugin): Removed -makefile qmake option.
diff --git a/src/VirtualLeaf-install.nsi b/src/VirtualLeaf-install.nsi
--- a/src/VirtualLeaf-install.nsi
+++ b/src/VirtualLeaf-install.nsi
@@ -118,7 +118,7 @@ section "Virtual Leaf executable"
   #sectionIn RO
   # define the output path for the Virtual Leaf executable
   setOutPath $INSTDIR\bin
-  writeUninstaller $INSTDIR\bin\uninstaller.exe
+  writeUninstaller $INSTDIR\uninstaller.exe
   file ..\bin\VirtualLeaf.exe
 
   # Required DLLs
diff --git a/src/mainbase.cpp b/src/mainbase.cpp
--- a/src/mainbase.cpp
+++ b/src/mainbase.cpp
@@ -29,6 +29,8 @@
 #include <string>
 
 #include <QLocale>
+#include <QDir>
+#include <QDebug>
 
 static const std::string _module_id("$Id$");
 
@@ -339,7 +341,10 @@ void MainBase::Save(const char *fname, c
     image->fill(QColor(Qt::white).rgb());
     QPainter *painter=new QPainter(image);
     canvas.render(painter);
-    if (!image->save(QString(fname))) {
+#ifdef QDEBUG
+    qDebug() << "Native Image Filename: " << QDir::toNativeSeparators(QString(fname)) << endl;
+#endif
+    if (!image->save(QDir::toNativeSeparators(QString(fname)), 0, -1)) {
       MyWarning::warning("Image not saved successfully. Is the disk full or the extension not recognized?");
     };
     delete painter;