diff --git a/src/libpsl-native/src/getcommonstat.h b/src/libpsl-native/src/getcommonstat.h
index 9fd9f40..bb17b22 100644
--- a/src/libpsl-native/src/getcommonstat.h
+++ b/src/libpsl-native/src/getcommonstat.h
@@ -11,16 +11,16 @@ PAL_BEGIN_EXTERNC
 
 struct CommonStat
 {
-    long Inode;
+    int64_t Inode;
     int Mode;
     int UserId;
     int GroupId;
     int HardlinkCount;
-    long Size;
-    long AccessTime;
-    long ModifiedTime;
-    long ChangeTime;
-    long BlockSize;
+    int64_t Size;
+    int64_t AccessTime;
+    int64_t ModifiedTime;
+    int64_t ChangeTime;
+    int64_t BlockSize;
     int DeviceId;
     int NumberOfBlocks;
     int IsDirectory;
diff --git a/src/libpsl-native/test/test-getcommonstat.cpp b/src/libpsl-native/test/test-getcommonstat.cpp
index 1df6a3d..bf04a04 100644
--- a/src/libpsl-native/test/test-getcommonstat.cpp
+++ b/src/libpsl-native/test/test-getcommonstat.cpp
@@ -274,6 +274,7 @@ TEST(GetCommonStat, Mode002)
     GetCommonStat(fname, &cs);
     unlink(fname);
     EXPECT_EQ(cs.Mode, buffer.st_mode);
+    EXPECT_EQ(cs.IsSetUid, 1);
 }
 
 TEST(GetCommonStat, Mode003)
@@ -291,6 +292,7 @@ TEST(GetCommonStat, Mode003)
     GetCommonStat(fname, &cs);
     unlink(fname);
     EXPECT_EQ(cs.Mode, buffer.st_mode);
+    // don't check for IsSetGid as that can vary from platform based on file system
 }
 
 TEST(GetCommonStat, Mode004)
@@ -308,5 +310,6 @@ TEST(GetCommonStat, Mode004)
     GetCommonStat(dname, &cs);
     rmdir(dname);
     EXPECT_EQ(cs.Mode, buffer.st_mode);
+    EXPECT_EQ(cs.IsSticky, 1);
 }