diff --git a/flowviewwindow.cpp b/flowviewwindow.cpp
index 68093b6..92414c6 100644
--- a/flowviewwindow.cpp
+++ b/flowviewwindow.cpp
@@ -176,7 +176,6 @@ void FlowViewWindow::saveFileGraph()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
@@ -201,7 +200,6 @@ void FlowViewWindow::saveFileFlow()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
diff --git a/framefileio.cpp b/framefileio.cpp
index 1165ca4..546aae2 100644
--- a/framefileio.cpp
+++ b/framefileio.cpp
@@ -226,7 +226,10 @@ bool FrameFileIO::saveNativeCSVFile(QString filename, const QVector<CANFrame>* f
 
         for (int temp = 0; temp < 8; temp++)
         {
-            outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8());
+            if (temp < frames->at(c).len)
+                outFile->write(QString::number(frames->at(c).data[temp], 16).toUpper().rightJustified(2, '0').toUtf8());
+            else
+                outFile->write("00");
             outFile->putChar(44);
         }
 
diff --git a/frameplaybackwindow.cpp b/frameplaybackwindow.cpp
index ec116a2..f16c24c 100644
--- a/frameplaybackwindow.cpp
+++ b/frameplaybackwindow.cpp
@@ -148,7 +148,6 @@ void FramePlaybackWindow::saveFilters()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
diff --git a/graphingwindow.cpp b/graphingwindow.cpp
index 2a84161..479fff7 100644
--- a/graphingwindow.cpp
+++ b/graphingwindow.cpp
@@ -345,7 +345,6 @@ void GraphingWindow::saveGraphs()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
@@ -369,7 +368,6 @@ void GraphingWindow::saveDefinitions()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e857f76..07ddfe0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -479,7 +479,6 @@ void MainWindow::handleSaveFile()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
@@ -531,7 +530,6 @@ void MainWindow::handleSaveFilteredFile()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
@@ -564,7 +562,6 @@ void MainWindow::handleSaveFilters()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
@@ -628,7 +625,6 @@ void MainWindow::handleSaveDBC()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {
@@ -652,7 +648,6 @@ void MainWindow::handleSaveDecoded()
     dialog.setNameFilters(filters);
     dialog.setViewMode(QFileDialog::Detail);
     dialog.setAcceptMode(QFileDialog::AcceptSave);
-    dialog.setOption(QFileDialog::DontUseNativeDialog);
 
     if (dialog.exec() == QDialog::Accepted)
     {