diff --git a/README.chromium b/README.chromium
index 7c827261d..b04d6fd7c 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1217
+Version: 1218
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index dde017cee..42669f09e 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -114,6 +114,7 @@ extern "C" {
 #define HAS_RGBATOUVROW_SSSE3
 #define HAS_RGBATOYROW_SSSE3
 #define HAS_SETROW_X86
+#define HAS_ARGBSETROWS_X86
 #define HAS_SPLITUVROW_SSE2
 #define HAS_UYVYTOARGBROW_SSSE3
 #define HAS_UYVYTOUV422ROW_SSE2
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 077807bc7..e7f689416 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1217
+#define LIBYUV_VERSION 1218
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/planar_functions.cc b/source/planar_functions.cc
index d43913c6a..0343afcf7 100644
--- a/source/planar_functions.cc
+++ b/source/planar_functions.cc
@@ -1166,13 +1166,13 @@ int ARGBRect(uint8* dst_argb, int dst_stride_argb,
     height = 1;
     dst_stride_argb = 0;
   }
-#if defined(HAS_SETROW_NEON)
+#if defined(HAS_ARGBSETROWS_NEON)
   if (TestCpuFlag(kCpuHasNEON) && IS_ALIGNED(width, 16)) {
     ARGBSetRows_NEON(dst_argb, value, width, dst_stride_argb, height);
     return 0;
   }
 #endif
-#if defined(HAS_SETROW_X86)
+#if defined(HAS_ARGBSETROWS_X86)
   if (TestCpuFlag(kCpuHasX86)) {
     ARGBSetRows_X86(dst_argb, value, width, dst_stride_argb, height);
     return 0;
diff --git a/source/row_common.cc b/source/row_common.cc
index 475e534e6..d29dc7675 100644
--- a/source/row_common.cc
+++ b/source/row_common.cc
@@ -1625,7 +1625,7 @@ void CopyRow_16_C(const uint16* src, uint16* dst, int count) {
 
 void SetRow_C(uint8* dst, uint32 v8, int count) {
 #ifdef _MSC_VER
-  // VC will generate rep stosb.
+  // VisualC will generate rep stosb.
   int x;
   for (x = 0; x < count; ++x) {
     dst[x] = v8;
diff --git a/source/row_win.cc b/source/row_win.cc
index b861b2e9b..f36f84eba 100644
--- a/source/row_win.cc
+++ b/source/row_win.cc
@@ -2848,7 +2848,7 @@ void ARGBCopyYToAlphaRow_AVX2(const uint8* src, uint8* dst, int width) {
 #endif  // HAS_ARGBCOPYYTOALPHAROW_AVX2
 
 #ifdef HAS_SETROW_X86
-// SetRow8 writes 'count' bytes using a 32 bit value repeated.
+// SetRow writes 'count' bytes using a 32 bit value repeated.
 __declspec(naked) __declspec(align(16))
 void SetRow_X86(uint8* dst, uint32 v32, int count) {
   __asm {