diff --git a/mace/kernels/batch_norm.h b/mace/kernels/batch_norm.h
index d81fdae9849d58d8357f4cccf14704e7e4bbbb84..136163f9cae9b23d856be5f20b84c21408e7a347 100644
--- a/mace/kernels/batch_norm.h
+++ b/mace/kernels/batch_norm.h
@@ -47,7 +47,7 @@ struct BatchNormFunctor : public BatchNormFunctorBase<D, T> {
       new_offset = offset[c] - mean[c] * new_scale;
 
       for (TIndex i = 0; i < n; ++i) {
-        TIndex pos = i * channel * sample_size + c * sample_size;
+        TIndex pos = (i * channel + c) * sample_size;
         const T* input_sample_ptr = input + pos;
         T* output_sample_ptr = output + pos;
         for (TIndex j = 0; j < sample_size; ++j) {
diff --git a/mace/kernels/neon/batch_norm_neon.cc b/mace/kernels/neon/batch_norm_neon.cc
index d307173f4a072fc58dad63fe9d2966f8c5ab2961..7121c23dfb773115dc4ba56d588a544f653bd76c 100644
--- a/mace/kernels/neon/batch_norm_neon.cc
+++ b/mace/kernels/neon/batch_norm_neon.cc
@@ -41,7 +41,7 @@ struct BatchNormFunctor<DeviceType::NEON> : public BatchNormFunctorBase<DeviceTy
       float32x4_t new_scale_f = vdupq_n_f32(new_scale);
       float32x4_t new_offset_f = vdupq_n_f32(new_offset);
       for (TIndex i = 0; i < n; ++i) {
-        TIndex pos = i * channel * sample_size + c * sample_size;
+        TIndex pos = (i * channel + c) * sample_size;
         const float* input_sample_ptr = input + pos;
         float* output_sample_ptr = output + pos;
 
diff --git a/mace/ops/BUILD b/mace/ops/BUILD
index 0394fa1d76502400918f3144a3c494374d577345..a408f7d9b749c6d20ab2e83fb0fcf9c4910cd0f2 100644
--- a/mace/ops/BUILD
+++ b/mace/ops/BUILD
@@ -12,7 +12,7 @@ load("//mace:mace.bzl", "if_android")
 cc_library(
     name = "test",
     testonly = 1,
-    srcs = [
+    hdrs = [
         "ops_test_util.h",
     ],
     deps = [
@@ -23,14 +23,14 @@ cc_library(
 
 cc_library(
     name = "ops",
-    srcs = [
-        "batch_norm.cc",
-        "relu.cc",
-    ],
-    hdrs = glob([
-        "relu.h",
-        "batch_norm.h",
-    ]),
+    srcs = glob(
+        ["*.cc"],
+        exclude = ["*_test.cc"],
+    ),
+    hdrs = glob(
+        ["*.h"],
+        exclude = ["ops_test_util.h"],
+    ),
     copts = ["-std=c++11"],
     deps = [
         "//mace/core",