5 files changed, 7 insertions, 6 deletions
diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp
index 3cb03646a..ccc39fbef 100644
--- a/src/extension/dbus/document-interface.cpp
+++ b/src/extension/dbus/document-interface.cpp
@@ -43,6 +43,7 @@
 #include "sp-object.h"
 #include "sp-root.h"
 #include "style.h" //style_write
+#include "util/units.h"
 
 #include "extension/system.h" //IO
 
@@ -543,13 +544,13 @@ gchar *document_interface_node(DocumentInterface *doc_interface, gchar *type, GE
 gdouble
 document_interface_document_get_width (DocumentInterface *doc_interface)
 {
-  return doc_interface->target.getDocument()->getWidth();
+  return doc_interface->target.getDocument()->getWidth().value("px");
 }
 
 gdouble
 document_interface_document_get_height (DocumentInterface *doc_interface)
 {
-  return doc_interface->target.getDocument()->getHeight();
+  return doc_interface->target.getDocument()->getHeight().value("px");
 }
 
 gchar *document_interface_document_get_css(DocumentInterface *doc_interface, GError ** error)
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 1a163d4c2..2dde9eeb8 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -295,7 +295,7 @@ static void
 build_module_from_dir(gchar const *dirname)
 {
     if (!dirname) {
-        g_warning(_("Null external module directory name.  Modules will not be loaded."));
+        g_warning("%s", _("Null external module directory name.  Modules will not be loaded."));
         return;
     }
 
diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp
index d569c6438..48e64f089 100644
--- a/src/extension/internal/filter/filter-file.cpp
+++ b/src/extension/internal/filter/filter-file.cpp
@@ -44,7 +44,7 @@ void
 Filter::filters_load_dir (gchar const * dirname, gchar * menuname)
 {
     if (!dirname) {
-        g_warning(_("Null external module directory name.  Filters will not be loaded."));
+        g_warning("%s", _("Null external module directory name.  Filters will not be loaded."));
         return;
     }
 
diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp
index c2f2b43a5..355a5784d 100644
--- a/src/extension/internal/pdf-input-cairo.cpp
+++ b/src/extension/internal/pdf-input-cairo.cpp
@@ -491,7 +491,7 @@ bool PdfImportCairoDialog::_onDraw(const Cairo::RefPtr<Cairo::Context>& cr) {
  */
 void PdfImportCairoDialog::_setPreviewPage(int page) {
 
-    PopplerPage *_previewed_page = poppler_document_get_page(_poppler_doc, page);
+    PopplerPage *_previewed_page = poppler_document_get_page(_poppler_doc, page-1);
 
     // Try to get a thumbnail from the PDF if possible
     if (!_render_thumb) {
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index f7fd48b3f..a4c370f4c 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -124,7 +124,7 @@ SPDocument *open(Extension *key, gchar const *filename)
         if ( inkscape_use_gui() ) {
             sp_ui_error_dialog(_("Format autodetect failed. The file is being opened as SVG."));
         } else {
-            g_warning(_("Format autodetect failed. The file is being opened as SVG."));
+            g_warning("%s", _("Format autodetect failed. The file is being opened as SVG."));
         }
     }