diff --git a/src/config/stds.h b/src/config/stds.h
index 7b256b6735..05dadd812a 100644
--- a/src/config/stds.h
+++ b/src/config/stds.h
@@ -66,8 +66,8 @@ typedef unsigned long long afs_uint64;
 #define CompareUInt64(a,b) (afs_uint64)(a) - (afs_uint64)(b)
 #define NonZeroInt64(a)                (a)
 #define Int64ToInt32(a)    (a) & 0xFFFFFFFFL
-#define FillInt64(t,h,l) (t) = (h); (t) <<= 32; (t) |= (l);
-#define SplitInt64(t,h,l) (h) = (t) >> 32; (l) = (t) & 0xFFFFFFFF;
+#define FillInt64(t,h,l) (t) = ((afs_int64)(h) << 32) | (l);
+#define SplitInt64(t,h,l) (h) = ((afs_int64)t) >> 32; (l) = (t) & 0xFFFFFFFF;
 #else /* AFS_64BIT_ENV */
 typedef long afs_int32;
 typedef unsigned long afs_uint32;
diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 0f671668b7..5bd5148838 100644
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -2818,7 +2818,7 @@ CopyAndSalvage(register struct DirSummary *dir)
     afs_sfsize_t lcode;
     afs_int32 parentUnique = 1;
     struct VnodeEssence *vnodeEssence;
-    afs_size_t length;
+    afs_fsize_t length;
 
     if (Testing)
 	return;