diff --git a/google/resource_compute_autoscaler_generated_test.go b/google/resource_compute_autoscaler_generated_test.go
index 3a6e6a54..33f06e5b 100644
--- a/google/resource_compute_autoscaler_generated_test.go
+++ b/google/resource_compute_autoscaler_generated_test.go
@@ -50,7 +50,7 @@ resource "google_compute_autoscaler" "foobar" {
   zone   = "us-central1-f"
   target = "${google_compute_instance_group_manager.foobar.self_link}"
 
-  autoscaling_policy = {
+  autoscaling_policy {
     max_replicas    = 5
     min_replicas    = 1
     cooldown_period = 60
diff --git a/google/resource_compute_autoscaler_test.go b/google/resource_compute_autoscaler_test.go
index be4f6457..09d015d8 100644
--- a/google/resource_compute_autoscaler_test.go
+++ b/google/resource_compute_autoscaler_test.go
@@ -252,7 +252,7 @@ resource "google_compute_autoscaler" "foobar" {
 	name = "%s"
 	zone = "us-central1-a"
 	target = "${google_compute_instance_group_manager.foobar.self_link}"
-	autoscaling_policy = {
+	autoscaling_policy {
 		max_replicas = 5
 		min_replicas = 1
 		cooldown_period = 60
@@ -272,7 +272,7 @@ resource "google_compute_autoscaler" "foobar" {
 	name = "%s"
 	zone = "us-central1-a"
 	target = "${google_compute_instance_group_manager.foobar.self_link}"
-	autoscaling_policy = {
+	autoscaling_policy {
 		max_replicas = 10
 		min_replicas = 1
 		cooldown_period = 60
@@ -292,7 +292,7 @@ resource "google_compute_autoscaler" "foobar" {
 	name = "%s"
 	zone = "us-central1-a"
 	target = "${google_compute_instance_group_manager.foobar.self_link}"
-	autoscaling_policy = {
+	autoscaling_policy {
 		max_replicas = 10
 		min_replicas = 1
 		cooldown_period = 60
diff --git a/google/resource_compute_instance_group_test.go b/google/resource_compute_instance_group_test.go
index 7e1cb899..ce536ddc 100644
--- a/google/resource_compute_instance_group_test.go
+++ b/google/resource_compute_instance_group_test.go
@@ -484,7 +484,7 @@ func testAccComputeInstanceGroup_update(instance string) string {
 		description = "Terraform test instance group"
 		name = "%s"
 		zone = "us-central1-c"
-		instances = [ "${google_compute_instance.ig_instance.*.self_link}" ]
+		instances = "${google_compute_instance.ig_instance.*.self_link}"
 		named_port {
 			name = "http"
 			port = "8080"
@@ -526,7 +526,7 @@ func testAccComputeInstanceGroup_update2(instance string) string {
 		description = "Terraform test instance group"
 		name = "%s"
 		zone = "us-central1-c"
-		instances = [ "${google_compute_instance.ig_instance.*.self_link}" ]
+		instances = "${google_compute_instance.ig_instance.*.self_link}"
 
 		named_port {
 			name = "http"
@@ -570,7 +570,7 @@ func testAccComputeInstanceGroup_recreateInstances(instance string) string {
 		description = "Terraform test instance group"
 		name = "%s"
 		zone = "us-central1-c"
-		instances = [ "${google_compute_instance.ig_instance.*.self_link}" ]
+		instances = "${google_compute_instance.ig_instance.*.self_link}"
 		named_port {
 			name = "http"
 			port = "8080"
diff --git a/google/resource_compute_instance_test.go b/google/resource_compute_instance_test.go
index b4500a2f..561d527d 100644
--- a/google/resource_compute_instance_test.go
+++ b/google/resource_compute_instance_test.go
@@ -2851,12 +2851,12 @@ resource "google_compute_instance" "foobar" {
 	network_interface {
 		subnetwork = "${google_compute_subnetwork.inst-test-subnetwork.self_link}"
 
-		alias_ip_range = [
-		{
+		alias_ip_range {
 			subnetwork_range_name = "${google_compute_subnetwork.inst-test-subnetwork.secondary_ip_range.0.range_name}"
 			ip_cidr_range         = "172.16.0.0/24"
-		},
-		{
+		}
+
+		alias_ip_range {
 			subnetwork_range_name = "${google_compute_subnetwork.inst-test-subnetwork.secondary_ip_range.1.range_name}"
 			ip_cidr_range         = "10.1.0.0/20"
 		}
diff --git a/google/resource_compute_region_autoscaler_generated_test.go b/google/resource_compute_region_autoscaler_generated_test.go
index eab7e63c..b9d78e65 100644
--- a/google/resource_compute_region_autoscaler_generated_test.go
+++ b/google/resource_compute_region_autoscaler_generated_test.go
@@ -50,7 +50,7 @@ resource "google_compute_region_autoscaler" "foobar" {
   region = "us-central1"
   target = "${google_compute_region_instance_group_manager.foobar.self_link}"
 
-  autoscaling_policy = {
+  autoscaling_policy {
     max_replicas    = 5
     min_replicas    = 1
     cooldown_period = 60
diff --git a/google/resource_compute_region_autoscaler_test.go b/google/resource_compute_region_autoscaler_test.go
index a06c4727..f287bc60 100644
--- a/google/resource_compute_region_autoscaler_test.go
+++ b/google/resource_compute_region_autoscaler_test.go
@@ -179,7 +179,7 @@ resource "google_compute_region_autoscaler" "foobar" {
 	name = "%s"
 	region = "us-central1"
 	target = "${google_compute_region_instance_group_manager.foobar.self_link}"
-	autoscaling_policy = {
+	autoscaling_policy {
 		max_replicas = 5
 		min_replicas = 1
 		cooldown_period = 60
@@ -240,7 +240,7 @@ resource "google_compute_region_autoscaler" "foobar" {
 	name = "%s"
 	region = "us-central1"
 	target = "${google_compute_region_instance_group_manager.foobar.self_link}"
-	autoscaling_policy = {
+	autoscaling_policy {
 		max_replicas = 10
 		min_replicas = 1
 		cooldown_period = 60
diff --git a/google/resource_compute_subnetwork_test.go b/google/resource_compute_subnetwork_test.go
index dbc3e4ec..f97decbb 100644
--- a/google/resource_compute_subnetwork_test.go
+++ b/google/resource_compute_subnetwork_test.go
@@ -379,7 +379,7 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
 	secondary_ip_range {
 		range_name = "tf-test-secondary-range-update2"
 		ip_cidr_range = "192.168.11.0/24"
-	},
+	}
 }
 `, cnName, subnetworkName)
 }
diff --git a/website/docs/r/compute_autoscaler.html.markdown b/website/docs/r/compute_autoscaler.html.markdown
index 67e0249d..48425ba7 100644
--- a/website/docs/r/compute_autoscaler.html.markdown
+++ b/website/docs/r/compute_autoscaler.html.markdown
@@ -48,7 +48,7 @@ resource "google_compute_autoscaler" "foobar" {
   zone   = "us-central1-f"
   target = "${google_compute_instance_group_manager.foobar.self_link}"
 
-  autoscaling_policy = {
+  autoscaling_policy {
     max_replicas    = 5
     min_replicas    = 1
     cooldown_period = 60
diff --git a/website/docs/r/compute_region_autoscaler.html.markdown b/website/docs/r/compute_region_autoscaler.html.markdown
index b5d46a2d..fcf73696 100644
--- a/website/docs/r/compute_region_autoscaler.html.markdown
+++ b/website/docs/r/compute_region_autoscaler.html.markdown
@@ -48,7 +48,7 @@ resource "google_compute_region_autoscaler" "foobar" {
   region = "us-central1"
   target = "${google_compute_region_instance_group_manager.foobar.self_link}"
 
-  autoscaling_policy = {
+  autoscaling_policy {
     max_replicas    = 5
     min_replicas    = 1
     cooldown_period = 60
diff --git a/website/docs/r/compute_router_nat.html.markdown b/website/docs/r/compute_router_nat.html.markdown
index d64a3bdb..ca4c7d8e 100644
--- a/website/docs/r/compute_router_nat.html.markdown
+++ b/website/docs/r/compute_router_nat.html.markdown
@@ -83,7 +83,7 @@ resource "google_compute_router_nat" "advanced-nat" {
   router                             = "${google_compute_router.router.name}"
   region                             = "us-central1"
   nat_ip_allocate_option             = "MANUAL_ONLY"
-  nat_ips                            = ["${google_compute_address.address.*.self_link}"]
+  nat_ips                            = "${google_compute_address.address.*.self_link}"
   source_subnetwork_ip_ranges_to_nat = "LIST_OF_SUBNETWORKS"
   subnetwork {
     name = "${google_compute_subnetwork.subnetwork.self_link}"