diff --git a/BUILD.bazel b/BUILD.bazel
index 33ca7e86..9b9a8a30 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -95,7 +95,7 @@ YARA_COPTS = YARA_MODULE_OPTS + select({
     "-Ilibyara/modules",
 ] + YARA_CONFIG_OPTS
 
-# Just Yara's error codes. This is useful for sandboxing as it avoids pulling
+# Just YARA's error codes. This is useful for sandboxing as it avoids pulling
 # in the whole library.
 cc_library(
     name = "yara_errors",
@@ -104,7 +104,7 @@ cc_library(
     visibility = ["//visibility:public"],
 )
 
-# Yara library to be linked against.
+# YARA library to be linked against.
 cc_library(
     name = "libyara",
     srcs = [
@@ -247,7 +247,7 @@ cc_library(
     deps = [":libyara"],
 )
 
-# Yara command-line tool
+# YARA command-line tool
 cc_binary(
     name = "yara",
     srcs = ["yara.c"],
@@ -259,7 +259,7 @@ cc_binary(
     ],
 )
 
-# The Yara compiler
+# The YARA compiler
 cc_binary(
     name = "yarac",
     srcs = ["yarac.c"],
diff --git a/libyara/include/yara/types.h b/libyara/include/yara/types.h
index fad78ad6..63218827 100644
--- a/libyara/include/yara/types.h
+++ b/libyara/include/yara/types.h
@@ -385,8 +385,8 @@ typedef YR_AC_MATCH_TABLE_ENTRY*  YR_AC_MATCH_TABLE;
 
 struct YR_AC_TABLES
 {
-  YR_AC_TRANSITION* transitions;
-  YR_AC_MATCH_TABLE_ENTRY* matches;
+  YR_AC_TRANSITION_TABLE transitions;
+  YR_AC_MATCH_TABLE matches;
 };
 
 
diff --git a/sandbox/BUILD.bazel b/sandbox/BUILD.bazel
index 7fa79472..e64a0b88 100644
--- a/sandbox/BUILD.bazel
+++ b/sandbox/BUILD.bazel
@@ -30,7 +30,7 @@ load(
     "sapi_library",
 )
 
-# Proto message  that stores YARA matches. Used to communicate matches from
+# Proto message that stores YARA matches. Used to communicate matches from
 # the sandboxee to the host code.
 proto_library(
     name = "yara_matches",