diff --git a/buildscripts/build.sh b/buildscripts/build.sh
index 683b863..2fa7b8a 100755
--- a/buildscripts/build.sh
+++ b/buildscripts/build.sh
@@ -66,13 +66,6 @@ if [ "$UNAME" != "Linux" -a "$UNAME" != "Darwin" ] ; then
     exit 1
 fi
 
-if [ "$UNAME" = "Darwin" ] ; then
-  XC_OS="darwin"
-elif [ "$UNAME" = "Linux" ] ; then
-  XC_OS="linux"
-fi
-
-
 if [ -z "${PNAME}" ];
 then
     echo "Project name not defined"
@@ -90,11 +83,8 @@ echo "==> Removing old directory..."
 rm -rf bin/${PNAME}/*
 mkdir -p bin/${PNAME}/
 
-# If its dev mode, only build for ourself
-if [[ "${DEV}" ]]; then
-    XC_OS=$(go env GOOS)
-    XC_ARCH=$(go env GOARCH)
-fi
+XC_OS=$(go env GOOS)
+XC_ARCH=$(go env GOARCH)
 
 # Build!
 echo "==> Building ${CTLNAME} using $(go version)... "
diff --git a/pkg/driver/agent.go b/pkg/driver/agent.go
index b064d3b..3855614 100644
--- a/pkg/driver/agent.go
+++ b/pkg/driver/agent.go
@@ -373,9 +373,9 @@ func (ns *node) NodeGetVolumeStats(
 	var usage []*csi.VolumeUsage
 	usage = append(usage, &csi.VolumeUsage{
 		Unit:      csi.VolumeUsage_BYTES,
-		Total:     int64(sfs.Blocks) * sfs.Bsize,
-		Used:      int64(sfs.Blocks-sfs.Bfree) * sfs.Bsize,
-		Available: int64(sfs.Bavail) * sfs.Bsize,
+		Total:     int64(sfs.Blocks) * int64(sfs.Bsize),
+		Used:      int64(sfs.Blocks-sfs.Bfree) * int64(sfs.Bsize),
+		Available: int64(sfs.Bavail) * int64(sfs.Bsize),
 	})
 	usage = append(usage, &csi.VolumeUsage{
 		Unit:      csi.VolumeUsage_INODES,