diff --git a/builtin/providers/aws/resource_aws_ecs_service.go b/builtin/providers/aws/resource_aws_ecs_service.go
index 19225361c..eb7b4c7e5 100644
--- a/builtin/providers/aws/resource_aws_ecs_service.go
+++ b/builtin/providers/aws/resource_aws_ecs_service.go
@@ -326,7 +326,7 @@ func resourceAwsEcsServiceDelete(d *schema.ResourceData, meta interface{}) error
 				return resp, "FAILED", err
 			}
 
-			log.Printf("[DEBUG] ECS service %s is currently %q", *resp.Services[0].Status)
+			log.Printf("[DEBUG] ECS service (%s) is currently %q", d.Id(), *resp.Services[0].Status)
 			return resp, *resp.Services[0].Status, nil
 		},
 	}
diff --git a/builtin/providers/azurerm/resource_arm_availability_set.go b/builtin/providers/azurerm/resource_arm_availability_set.go
index 3209d7008..3eb7c8506 100644
--- a/builtin/providers/azurerm/resource_arm_availability_set.go
+++ b/builtin/providers/azurerm/resource_arm_availability_set.go
@@ -52,7 +52,7 @@ func resourceArmAvailabilitySet() *schema.Resource {
 					value := v.(int)
 					if value > 3 {
 						errors = append(errors, fmt.Errorf(
-							"Maximum value for `platform_fault_domain_count` is 3", k))
+							"Maximum value for (%s) is 3", k))
 					}
 					return
 				},