diff --git a/rabin/rabin_dedup.c b/rabin/rabin_dedup.c
index b855c72..6dd6538 100755
--- a/rabin/rabin_dedup.c
+++ b/rabin/rabin_dedup.c
@@ -970,6 +970,7 @@ process_blocks:
 					for (j = 0; j < length && sub_i < cfg->sub_intervals;) {
 						b = *((uint64_t *)tgt);
 						tgt += sizeof (uint64_t);
+						j += sizeof (uint64_t);
 						if (b != a) {
 							*((uint64_t *)sim_ck) = b;
 							sim_ck += sizeof (uint64_t);
diff --git a/utils/utils.c b/utils/utils.c
index 9350a3d..f647db3 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -397,10 +397,10 @@ get_sys_limits(my_sysinfo *msys_info)
 	if (rv == -1) {
 		sys_info.freeram = 100 * 1024 * 1024; // 100M arbitrary
 	}
-	msys_info->totalram = sys_info.totalram;
-	msys_info->freeram = sys_info.freeram;
-	msys_info->totalswap = sys_info.totalswap;
-	msys_info->freeswap = sys_info.freeswap;
+	msys_info->totalram = sys_info.totalram * sys_info.mem_unit;
+	msys_info->freeram = sys_info.freeram * sys_info.mem_unit + sys_info.bufferram * sys_info.mem_unit;
+	msys_info->totalswap = sys_info.totalswap * sys_info.mem_unit;
+	msys_info->freeswap = sys_info.freeswap * sys_info.mem_unit;
 	msys_info->mem_unit = sys_info.mem_unit;
 
 	if ((val = getenv("PCOMPRESS_INDEX_MEM")) != NULL) {