diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 961b34a..68c98cc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -155,8 +155,8 @@ void MainWindow::turnstileProgress() {
         }
     });
 
-    auto accpeted = d.exec();    
-    if (accpeted == QDialog::Accepted && curProgress.step == curProgress.totalSteps) {
+    d.exec();    
+    if (curProgress.step == curProgress.totalSteps) {
         // Finished, so delete the file
         rpc->getTurnstile()->removeFile();
     }    
diff --git a/src/rpc.cpp b/src/rpc.cpp
index 46d47d5..1ae555d 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -447,7 +447,7 @@ void RPC::refreshReceivedZTrans(QList<QString> zaddrs) {
                             // Lookup txid in the map
                             auto txidInfo = txidDetails->value(txid);
 
-                            unsigned long timestamp;
+                            qint64 timestamp;
                             if (txidInfo.find("time") != txidInfo.end()) {
                                 timestamp = txidInfo["time"].get<json::number_unsigned_t>();
                             } else {
@@ -655,7 +655,7 @@ void RPC::refreshTransactions() {
 
             TransactionItem tx{
                 QString::fromStdString(it["category"]),
-                (unsigned long)it["time"].get<json::number_unsigned_t>(),
+                (qint64)it["time"].get<json::number_unsigned_t>(),
                 (it["address"].is_null() ? "" : QString::fromStdString(it["address"])),
                 QString::fromStdString(it["txid"]),
                 it["amount"].get<json::number_float_t>() + fee,
diff --git a/src/senttxstore.cpp b/src/senttxstore.cpp
index feeaee5..9a17720 100644
--- a/src/senttxstore.cpp
+++ b/src/senttxstore.cpp
@@ -38,7 +38,7 @@ QList<TransactionItem> SentTxStore::readSentTxFile() {
 
     for (auto i : jsonDoc.array()) {
         auto sentTx = i.toObject();
-        TransactionItem t{"send", (unsigned long)sentTx["datetime"].toInt(), 
+        TransactionItem t{"send", (qint64)sentTx["datetime"].toVariant().toLongLong(), 
                           sentTx["address"].toString(), 
                           sentTx["txid"].toString(), 
 						  sentTx["amount"].toDouble() + sentTx["fee"].toDouble(),