diff --git a/source/row_neon64.cc b/source/row_neon64.cc
index 0fe54c830..9bef8c44f 100644
--- a/source/row_neon64.cc
+++ b/source/row_neon64.cc
@@ -5593,16 +5593,16 @@ void Convert8To16Row_NEON(const uint8_t* src_y,
   // to widen to int32.
   int shift = 15 - __builtin_clz(scale);
   asm volatile(
-      "dup    v2.8h, %w[shift]                 \n"
-      "1:                                      \n"
-      "ldr    q0, [%[src]], #16                \n"
-      "zip2   v1.16b, v0.16b, v0.16b           \n"
-      "zip1   v0.16b, v0.16b, v0.16b           \n"
-      "subs   %w[width], %w[width], #16        \n"
-      "ushl   v1.8h, v1.8h, v2.8h              \n"
-      "ushl   v0.8h, v0.8h, v2.8h              \n"
-      "stp    q0, q1, [%[dst]], #32            \n"
-      "b.ne   1b                               \n"
+      "dup         v2.8h, %w[shift]                 \n"
+      "1:          \n"
+      "ldr         q0, [%[src]], #16                \n"
+      "zip2        v1.16b, v0.16b, v0.16b           \n"
+      "zip1        v0.16b, v0.16b, v0.16b           \n"
+      "subs        %w[width], %w[width], #16        \n"
+      "ushl        v1.8h, v1.8h, v2.8h              \n"
+      "ushl        v0.8h, v0.8h, v2.8h              \n"
+      "stp         q0, q1, [%[dst]], #32            \n"
+      "b.ne        1b                               \n"
       : [src] "+r"(src_y),   // %[src]
         [dst] "+r"(dst_y),   // %[dst]
         [width] "+r"(width)  // %[width]
diff --git a/unit_test/convert_argb_test.cc b/unit_test/convert_argb_test.cc
index 71814d879..0ef4bd954 100644
--- a/unit_test/convert_argb_test.cc
+++ b/unit_test/convert_argb_test.cc
@@ -2721,7 +2721,7 @@ TEST_F(LibYUVConvertTest, TestUYVYToARGB) {
   EXPECT_EQ(3486643515u, checksum);
 }
 
-#if defined(_M_X64) || defined(_M_X64) || defined(__aarch64__)
+#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__)
 TEST_F(LibYUVConvertTest, TestI400LargeSize) {
   // The width and height are chosen as follows:
   // - kWidth * kHeight is not a multiple of 8: This lets us to use the Any