diff --git a/archive/archive_unix.go b/archive/archive_unix.go
index cbce65e..82c9a82 100644
--- a/archive/archive_unix.go
+++ b/archive/archive_unix.go
@@ -36,8 +36,8 @@ func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, st
 	inode = uint64(s.Ino)
 
 	// Currently go does not fil in the major/minors
-	if s.Mode&syscall.S_IFBLK == syscall.S_IFBLK ||
-		s.Mode&syscall.S_IFCHR == syscall.S_IFCHR {
+	if s.Mode&syscall.S_IFBLK != 0 ||
+		s.Mode&syscall.S_IFCHR != 0 {
 		hdr.Devmajor = int64(major(uint64(s.Rdev)))
 		hdr.Devminor = int64(minor(uint64(s.Rdev)))
 	}
diff --git a/archive/changes.go b/archive/changes.go
index c3cb4eb..96aff36 100644
--- a/archive/changes.go
+++ b/archive/changes.go
@@ -176,7 +176,7 @@ func (info *FileInfo) path() string {
 }
 
 func (info *FileInfo) isDir() bool {
-	return info.parent == nil || info.stat.Mode()&syscall.S_IFDIR == syscall.S_IFDIR
+	return info.parent == nil || info.stat.Mode()&syscall.S_IFDIR != 0
 }
 
 func (info *FileInfo) addChanges(oldInfo *FileInfo, changes *[]Change) {