diff --git a/AutoTx/AutoTx.cs b/AutoTx/AutoTx.cs
index 7263467f85c6821fd73996008c8dba2bf1fc7eb9..e3ee62ccdddfe03585458e6eaf8d11a8659b0591 100644
--- a/AutoTx/AutoTx.cs
+++ b/AutoTx/AutoTx.cs
@@ -35,9 +35,6 @@ namespace AutoTx
 
         private int _txProgress;
 
-        private const int MegaBytes = 1024 * 1024;
-        private const int GigaBytes = 1024 * 1024 * 1024;
-
         private DateTime _lastUserDirCheck = DateTime.Now;
 
         // the transfer state:
diff --git a/AutoTx/RoboCommand.cs b/AutoTx/RoboCommand.cs
index ae4c4c524dec762042ef8d4d71b9f0369f7f0773..0078517b2100c31749a0d4443ff962baa4d1c437 100644
--- a/AutoTx/RoboCommand.cs
+++ b/AutoTx/RoboCommand.cs
@@ -73,7 +73,7 @@ namespace AutoTx
                 _roboCommand.RetryOptions.RetryWaitTime = 2;
                 _roboCommand.Start();
                 Log.Info("Transfer started, total size: {0} MB",
-                    _status.CurrentTransferSize / MegaBytes);
+                    _status.CurrentTransferSize / Conv.MegaBytes);
             }
             catch (ManagementException ex) {
                 Log.Error("Error in StartTransfer(): {0}", ex.Message);
diff --git a/AutoTx/SystemChecks.cs b/AutoTx/SystemChecks.cs
index 31b7aefc0e369e83782ec155f27408594696dd13..cbda3a29b96fc37b58ddce566419897570d63c83 100644
--- a/AutoTx/SystemChecks.cs
+++ b/AutoTx/SystemChecks.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Management;
+using ATXCommon;
 
 namespace AutoTx
 {
@@ -55,7 +56,7 @@ namespace AutoTx
         private long GetFreeDriveSpace(string drive) {
             try {
                 var dInfo = new DriveInfo(drive);
-                return dInfo.TotalFreeSpace / MegaBytes;
+                return dInfo.TotalFreeSpace / Conv.MegaBytes;
             }
             catch (Exception ex) {
                 Log.Warn("Error in GetFreeDriveSpace({0}): {1}", drive, ex.Message);