diff --git a/azurerm/data_source_batch_certificate.go b/azurerm/data_source_batch_certificate.go
index e79bf12076ea..fff2e3609e7d 100644
--- a/azurerm/data_source_batch_certificate.go
+++ b/azurerm/data_source_batch_certificate.go
@@ -18,12 +18,15 @@ func dataSourceArmBatchCertificate() *schema.Resource {
 				Required:     true,
 				ValidateFunc: validateAzureRMBatchCertificateName,
 			},
+
 			"account_name": {
 				Type:         schema.TypeString,
 				Required:     true,
 				ValidateFunc: validateAzureRMBatchAccountName,
 			},
+
 			"resource_group_name": resourceGroupNameForDataSourceSchema(),
+
 			"public_data": {
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/azurerm/resource_arm_api_management.go b/azurerm/resource_arm_api_management.go
index 78257aa0c411..b8a0b4f7aee3 100644
--- a/azurerm/resource_arm_api_management.go
+++ b/azurerm/resource_arm_api_management.go
@@ -257,10 +257,11 @@ func resourceArmApiManagementService() *schema.Resource {
 			},
 
 			"policy": {
-				Type:     schema.TypeList,
-				Optional: true,
-				Computed: true,
-				MaxItems: 1,
+				Type:       schema.TypeList,
+				Optional:   true,
+				Computed:   true,
+				MaxItems:   1,
+				ConfigMode: schema.SchemaConfigModeAttr,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"xml_content": {
diff --git a/azurerm/resource_arm_batch_pool_test.go b/azurerm/resource_arm_batch_pool_test.go
index a7c6b188102b..f8f5d86bdae6 100644
--- a/azurerm/resource_arm_batch_pool_test.go
+++ b/azurerm/resource_arm_batch_pool_test.go
@@ -902,16 +902,19 @@ resource "azurerm_batch_pool" "test" {
     offer     = "UbuntuServer"
     sku       = "16.04.0-LTS"
     version   = "latest"
-	}
-	certificate = [ {
-		id             = "${azurerm_batch_certificate.testcer.id}"
-		store_location = "CurrentUser"
-		visibility     = [ "StartTask" ]
-	}, {
-		id             = "${azurerm_batch_certificate.testpfx.id}"
-		store_location = "CurrentUser"
-		visibility     = [ "StartTask", "RemoteUser" ]
-	}]
+  }
+
+  certificate {
+    id             = "${azurerm_batch_certificate.testcer.id}"
+    store_location = "CurrentUser"
+    visibility     = [ "StartTask" ]
+  }
+
+  certificate {
+    id             = "${azurerm_batch_certificate.testpfx.id}"
+    store_location = "CurrentUser"
+    visibility     = [ "StartTask", "RemoteUser" ]
+  }
 }
 
 `, rInt, location, rString, rString)
diff --git a/azurerm/resource_arm_container_group_test.go b/azurerm/resource_arm_container_group_test.go
index d2e4f7e49e76..4db2e9569a47 100755
--- a/azurerm/resource_arm_container_group_test.go
+++ b/azurerm/resource_arm_container_group_test.go
@@ -961,7 +961,7 @@ resource "azurerm_container_group" "test" {
       protocol = "TCP"
     }
 
-    gpu = {
+    gpu {
       count = 1
       sku = "K80"
     }