diff --git a/builtin/providers/aws/resource_aws_network_acl.go b/builtin/providers/aws/resource_aws_network_acl.go
index 4753f13444..cbc3af42d8 100644
--- a/builtin/providers/aws/resource_aws_network_acl.go
+++ b/builtin/providers/aws/resource_aws_network_acl.go
@@ -188,7 +188,7 @@ func resourceAwsNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error
 		newSubnet := n.(string)
 		association, err := findNetworkAclAssociation(newSubnet, ec2conn)
 		if err != nil {
-			return fmt.Errorf("Failed to update acl %s with subnet %s: ", d.Id(), newSubnet, err)
+			return fmt.Errorf("Failed to update acl %s with subnet %s: %s", d.Id(), newSubnet, err)
 		}
 		_, err = ec2conn.ReplaceNetworkAclAssociation(association.NetworkAclAssociationId, d.Id())
 		if err != nil {
@@ -219,9 +219,9 @@ func updateNetworkAclEntries(d *schema.ResourceData, entryType string, ec2conn *
 
 	os := o.(*schema.Set)
 	ns := n.(*schema.Set)
-	
+
 	toBeDeleted, err := expandNetworkAclEntries(os.Difference(ns).List(), entryType)
-	if(err != nil){
+	if err != nil {
 		return err
 	}
 	for _, remove := range toBeDeleted {
@@ -233,7 +233,7 @@ func updateNetworkAclEntries(d *schema.ResourceData, entryType string, ec2conn *
 	}
 
 	toBeCreated, err := expandNetworkAclEntries(ns.Difference(os).List(), entryType)
-	if(err != nil){
+	if err != nil {
 		return err
 	}
 	for _, add := range toBeCreated {
@@ -261,11 +261,11 @@ func resourceAwsNetworkAclDelete(d *schema.ResourceData, meta interface{}) error
 				// This means the subnet is attached to default acl of vpc.
 				association, err := findNetworkAclAssociation(d.Get("subnet_id").(string), ec2conn)
 				if err != nil {
-					return fmt.Errorf("Depedency voilation: Can not delete acl: %s", d.Id(), err)
+					return fmt.Errorf("Dependency violation: Cannot delete acl %s: %s", d.Id(), err)
 				}
 				defaultAcl, err := getDefaultNetworkAcl(d.Get("vpc_id").(string), ec2conn)
 				if err != nil {
-					return fmt.Errorf("Depedency voilation: Can not delete acl %s", d.Id(), err)
+					return fmt.Errorf("Dependency violation: Cannot delete acl %s: %s", d.Id(), err)
 				}
 				_, err = ec2conn.ReplaceNetworkAclAssociation(association.NetworkAclAssociationId, defaultAcl.NetworkAclId)
 				return resource.RetryError{err}
@@ -283,7 +283,7 @@ func resourceAwsNetworkAclEntryHash(v interface{}) int {
 	var buf bytes.Buffer
 	m := v.(map[string]interface{})
 	buf.WriteString(fmt.Sprintf("%d-", m["from_port"].(int)))
-	buf.WriteString(fmt.Sprintf("%s-", m["to_port"].(int)))
+	buf.WriteString(fmt.Sprintf("%d-", m["to_port"].(int)))
 	buf.WriteString(fmt.Sprintf("%d-", m["rule_no"].(int)))
 	buf.WriteString(fmt.Sprintf("%s-", m["action"].(string)))
 	buf.WriteString(fmt.Sprintf("%s-", m["protocol"].(string)))
diff --git a/builtin/providers/aws/resource_aws_network_acl_test.go b/builtin/providers/aws/resource_aws_network_acl_test.go
index a44eeeff8c..939e8633e0 100644
--- a/builtin/providers/aws/resource_aws_network_acl_test.go
+++ b/builtin/providers/aws/resource_aws_network_acl_test.go
@@ -274,7 +274,7 @@ func testAccCheckSubnetIsAssociatedWithAcl(acl string, sub string) resource.Test
 		}
 
 		r, _ := conn.NetworkAcls([]string{}, ec2.NewFilter())
-		fmt.Printf("\n\nall acls\n %s\n\n", r.NetworkAcls)
+		fmt.Printf("\n\nall acls\n %#v\n\n", r.NetworkAcls)
 		conn.NetworkAcls([]string{}, filter)
 
 		return fmt.Errorf("Network Acl %s is not associated with subnet %s", acl, sub)
diff --git a/builtin/providers/aws/resource_aws_subnet_test.go b/builtin/providers/aws/resource_aws_subnet_test.go
index 461c27269d..97cca8e078 100644
--- a/builtin/providers/aws/resource_aws_subnet_test.go
+++ b/builtin/providers/aws/resource_aws_subnet_test.go
@@ -18,7 +18,7 @@ func TestAccAWSSubnet(t *testing.T) {
 		}
 
 		if v.MapPublicIpOnLaunch != true {
-			return fmt.Errorf("bad MapPublicIpOnLaunch: %s", v.MapPublicIpOnLaunch)
+			return fmt.Errorf("bad MapPublicIpOnLaunch: %t", v.MapPublicIpOnLaunch)
 		}
 
 		return nil