diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp
index ba7a2d66d..a7e5984d2 100644
--- a/src/app/valentina/mainwindow.cpp
+++ b/src/app/valentina/mainwindow.cpp
@@ -568,8 +568,8 @@ void MainWindow::SetToolButton(bool checked, Tool t, const QString &cursor, cons
             }
         }
         QPixmap pixmap(cursorResource);
-        QCursor cur(pixmap, 2, 3);
-        ui->view->setCursor(cur);
+        QCursor cur(pixmap, 2, 2);
+        ui->view->viewport()->setCursor(cur);
         helpLabel->setText(toolTip);
         ui->view->setShowToolOptions(false);
         dialogTool = QSharedPointer<Dialog>(new Dialog(pattern, 0, this));
@@ -2201,7 +2201,7 @@ void  MainWindow::ArrowTool()
 
     ui->view->AllowRubberBand(true);
 
-    ui->view->setCursor(Qt::ArrowCursor);
+    ui->view->viewport()->unsetCursor();
     helpLabel->setText("");
     ui->view->setShowToolOptions(true);
     qCDebug(vMainWindow, "Enabled arrow tool.");
diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp
index d415bb900..c917a3ee7 100644
--- a/src/app/valentina/mainwindowsnogui.cpp
+++ b/src/app/valentina/mainwindowsnogui.cpp
@@ -1015,23 +1015,7 @@ void MainWindowsNoGUI::FlatDxfFile(const QString &name, int version, bool binary
     generator.setResolution(PrintDPI);
     generator.SetVersion(static_cast<DRW::Version>(version));
     generator.SetBinaryFormat(binary);
-
-    switch (*pattern->GetPatternUnit())
-    {
-        case Unit::Cm:
-            generator.setInsunits(VarInsunits::Centimeters);
-            break;
-        case Unit::Mm:
-            generator.setInsunits(VarInsunits::Millimeters);
-            break;
-        case Unit::Inch:
-            generator.setInsunits(VarInsunits::Inches);
-            break;
-        case Unit::Px:
-        case Unit::LAST_UNIT_DO_NOT_USE:
-            Q_UNREACHABLE();
-            break;
-    }
+    generator.setInsunits(VarInsunits::Millimeters);// Decided to always use mm. See issue #745
 
     QPainter painter;
     if (painter.begin(&generator))
@@ -1052,24 +1036,7 @@ void MainWindowsNoGUI::AAMADxfFile(const QString &name, int version, bool binary
     generator.setResolution(PrintDPI);
     generator.SetVersion(static_cast<DRW::Version>(version));
     generator.SetBinaryFormat(binary);
-
-    switch (*pattern->GetPatternUnit())
-    {
-        case Unit::Cm:
-            generator.setInsunits(VarInsunits::Centimeters);
-            break;
-        case Unit::Mm:
-            generator.setInsunits(VarInsunits::Millimeters);
-            break;
-        case Unit::Inch:
-            generator.setInsunits(VarInsunits::Inches);
-            break;
-        case Unit::Px:
-        case Unit::LAST_UNIT_DO_NOT_USE:
-            Q_UNREACHABLE();
-            break;
-    }
-
+    generator.setInsunits(VarInsunits::Millimeters);// Decided to always use mm. See issue #745
     generator.ExportToAAMA(details);
 }
 
diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp
index e8c8129c0..6bd162209 100644
--- a/src/libs/vdxf/vdxfengine.cpp
+++ b/src/libs/vdxf/vdxfengine.cpp
@@ -81,7 +81,7 @@ VDxfEngine::VDxfEngine()
       matrix(),
       input(),
       varMeasurement(VarMeasurement::Metric),
-      varInsunits(VarInsunits::Centimeters),
+      varInsunits(VarInsunits::Millimeters),
       textBuffer(new DRW_Text())
 {
 }