diff --git a/includes/fields/class-acf-field.php b/includes/fields/class-acf-field.php
index 65ba4b2e..bf85248d 100755
--- a/includes/fields/class-acf-field.php
+++ b/includes/fields/class-acf-field.php
@@ -1,8 +1,8 @@
 <?php
 
-if ( ! class_exists( 'acf_field' ) ) :
+if ( ! class_exists( 'ACF_Field' ) ) :
 
-	class acf_field {
+	class ACF_Field {
 
 		// vars
 		var $name = '',
diff --git a/includes/forms/form-comment.php b/includes/forms/form-comment.php
index 9defdce7..cbbfa9f2 100644
--- a/includes/forms/form-comment.php
+++ b/includes/forms/form-comment.php
@@ -209,7 +209,7 @@ function comment_form_field_comment( $html ) {
 			global $post;
 
 			// vars
-			$post_id = false;
+			$post_id = $post->ID;;
 
 			// get field groups
 			$field_groups = acf_get_field_groups(
diff --git a/includes/walkers/class-acf-walker-taxonomy-field.php b/includes/walkers/class-acf-walker-taxonomy-field.php
index bb780f7d..ff6bb5e8 100644
--- a/includes/walkers/class-acf-walker-taxonomy-field.php
+++ b/includes/walkers/class-acf-walker-taxonomy-field.php
@@ -94,6 +94,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {
 		 * @param int     $id       ID of the current term.
 		 */
 		public function start_el( &$output, $term, $depth = 0, $args = array(), $id = 0 ) {
+			$term->term_id = (int) $term->term_id;
 			$is_selected = in_array( $term->term_id, $this->field['value'] );
 
 			// Generate array of checkbox input attributes.
@@ -106,7 +107,7 @@ public function start_el( &$output, $term, $depth = 0, $args = array(), $id = 0
 				$input_attrs['checked'] = true;
 			}
 
-			$output .= "\n" . '<li data-id="' . esc_attr( $term->term_id ) . '">' .
+			$output .= "\n" . '<li data-id="' . $term->term_id  . '">' .
 			'<label' . ( $is_selected ? ' class="selected"' : '' ) . '>' .
 				'<input ' . acf_esc_attrs( $input_attrs ) . '/> ' .
 				'<span>' . acf_esc_html( $term->name ) . '</span>' .