diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 19efd42..bcabb1c 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -521,7 +521,8 @@
 
 bool TWPartitionManager::Backup_Partition(TWPartition* Part, string Backup_Folder, bool generate_md5, unsigned long long* img_bytes_remaining, unsigned long long* file_bytes_remaining, unsigned long *img_time, unsigned long *file_time, unsigned long long *img_bytes, unsigned long long *file_bytes) {
 	time_t start, stop;
-	int img_bps, file_bps;
+	int img_bps;
+	unsigned long long file_bps;
 	unsigned long total_time, remain_time, section_time;
 	int use_compression, backup_time;
 	float pos;
@@ -644,8 +645,9 @@
 		backup_sys = Find_Partition_By_Path("/system");
 		if (backup_sys != NULL) {
 			partition_count++;
-			if (backup_sys->Backup_Method == 1)
+			if (backup_sys->Backup_Method == 1) {
 				file_bytes += backup_sys->Backup_Size;
+			}
 			else
 				img_bytes += backup_sys->Backup_Size;
 		} else {
@@ -852,9 +854,9 @@
 	if (file_time == 0)
 		file_time = 1;
 	int img_bps = (int)img_bytes / (int)img_time;
-	int file_bps = (int)file_bytes / (int)file_time;
+	unsigned long long file_bps = file_bytes / (int)file_time;
 
-	ui_print("Average backup rate for file systems: %lu MB/sec\n", (file_bps / (1024 * 1024)));
+	ui_print("Average backup rate for file systems: %llu MB/sec\n", (file_bps / (1024 * 1024)));
 	ui_print("Average backup rate for imaged drives: %lu MB/sec\n", (img_bps / (1024 * 1024)));
 
 	time(&total_stop);
@@ -862,7 +864,8 @@
 	unsigned long long actual_backup_size = TWFunc::Get_Folder_Size(Full_Backup_Path, true);
     actual_backup_size /= (1024LLU * 1024LLU);
 
-	int prev_img_bps, prev_file_bps, use_compression;
+	int prev_img_bps, use_compression;
+	unsigned long long prev_file_bps;
 	DataManager::GetValue(TW_BACKUP_AVG_IMG_RATE, prev_img_bps);
 	img_bps += (prev_img_bps * 4);
     img_bps /= 5;