diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp
index 82a7f5a82b..364eb6ac06 100644
--- a/eeschema/dialogs/dialog_print_using_printer.cpp
+++ b/eeschema/dialogs/dialog_print_using_printer.cpp
@@ -395,9 +395,9 @@ bool SCH_PRINTOUT::OnBeginDocument( int startPage, int endPage )
  */
 void SCH_PRINTOUT::PrintPage( SCH_SCREEN* aScreen )
 {
-    wxPoint  tmp_startvisu;
+    VECTOR2I tmp_startvisu;
     wxSize   pageSizeIU;             // Page size in internal units
-    wxPoint  old_org;
+    VECTOR2I old_org;
     wxRect   fitRect;
     wxDC*    dc = GetDC();
 
diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp
index 933ca5232e..01ad3169b9 100644
--- a/eeschema/sheet.cpp
+++ b/eeschema/sheet.cpp
@@ -503,9 +503,9 @@ void SCH_EDIT_FRAME::DrawCurrentSheetToClipboard()
 
     // Set draw offset, zoom... to values needed to draw in the memory DC
     // after saving initial values:
-    wxPoint tmp_startvisu = screen->m_StartVisu;
-    wxPoint old_org       = screen->m_DrawOrg;
-    screen->m_DrawOrg.x   = screen->m_DrawOrg.y = 0;
+    VECTOR2I tmp_startvisu = screen->m_StartVisu;
+    VECTOR2I old_org = screen->m_DrawOrg;
+    screen->m_DrawOrg.x = screen->m_DrawOrg.y = 0;
     screen->m_StartVisu.x = screen->m_StartVisu.y = 0;
 
     wxMemoryDC dc;
diff --git a/include/base_screen.h b/include/base_screen.h
index 0e817b39d5..5fe42874c8 100644
--- a/include/base_screen.h
+++ b/include/base_screen.h
@@ -85,12 +85,12 @@ public:
     static wxString m_DrawingSheetFileName;  ///< the name of the drawing sheet file, or empty
                                              ///< to use the default drawing sheet
 
-    wxPoint     m_DrawOrg;          ///< offsets for drawing the circuit on the screen
+    VECTOR2I    m_DrawOrg;          ///< offsets for drawing the circuit on the screen
 
     VECTOR2D    m_LocalOrigin;      ///< Relative Screen cursor coordinate (on grid)
                                     ///< in user units. (coordinates from last reset position)
 
-    wxPoint     m_StartVisu;        ///< Coordinates in drawing units of the current
+    VECTOR2I    m_StartVisu;        ///< Coordinates in drawing units of the current
                                     ///< view position (upper left corner of device)
 
     bool        m_Center;           ///< Center on screen.  If true (0.0) is centered on screen
diff --git a/pagelayout_editor/dialogs/dialogs_for_printing.cpp b/pagelayout_editor/dialogs/dialogs_for_printing.cpp
index 93f010f007..c30a157bf1 100644
--- a/pagelayout_editor/dialogs/dialogs_for_printing.cpp
+++ b/pagelayout_editor/dialogs/dialogs_for_printing.cpp
@@ -156,9 +156,9 @@ void PLEDITOR_PRINTOUT::GetPageInfo( int* minPage, int* maxPage,
 
 void PLEDITOR_PRINTOUT::PrintPage( int aPageNum )
 {
-    wxPoint  tmp_startvisu;
+    VECTOR2I  tmp_startvisu;
     wxSize   pageSizeIU;             // Page size in internal units
-    wxPoint  old_org;
+    VECTOR2I     old_org;
     wxRect   fitRect;
     wxDC*    dc = GetDC();
     BASE_SCREEN* screen = m_parent->GetScreen();
diff --git a/qa/eeschema/test_module.cpp b/qa/eeschema/test_module.cpp
index 83bdb3ace7..4dc2f00a31 100644
--- a/qa/eeschema/test_module.cpp
+++ b/qa/eeschema/test_module.cpp
@@ -27,6 +27,7 @@
  * Main file for the Eeschema tests to be compiled
  */
 #include <boost/test/unit_test.hpp>
+#include <kiplatform/app.h>
 
 #include <pgm_base.h>
 #include <wx/init.h>
@@ -47,6 +48,7 @@ void wxAssertThrower( const wxString& aFile, int aLine, const wxString& aFunc,
 
 bool init_unit_test()
 {
+    KIPLATFORM::APP::Init();
     boost::unit_test::framework::master_test_suite().p_name.value = "Common Eeschema module tests";
 
     bool ok = wxInitialize( boost::unit_test::framework::master_test_suite().argc,