diff --git a/concepts/observability/metrics.md b/concepts/observability/metrics.md
index 02d8613a7..da2111ec9 100644
--- a/concepts/observability/metrics.md
+++ b/concepts/observability/metrics.md
@@ -12,7 +12,7 @@ The default metrics port is `9090`. This can be overridden by passing the comman
 
 Each Dapr system process emits Go runtime/process metrics by default and have their own metrics:
 
-- [Dapr runtime metric list](https://github.com/dapr/dapr/blob/master/pkg/diagnostics/README.md)
+- [Dapr metric list](https://github.com/dapr/dapr/blob/master/docs/development/dapr-metrics.md)
 
 ## References
 
diff --git a/howto/setup-pub-sub-message-broker/setup-azure-servicebus.md b/howto/setup-pub-sub-message-broker/setup-azure-servicebus.md
index ec51a8e5b..14b2c47f4 100644
--- a/howto/setup-pub-sub-message-broker/setup-azure-servicebus.md
+++ b/howto/setup-pub-sub-message-broker/setup-azure-servicebus.md
@@ -47,4 +47,4 @@ kubectl apply -f azuresb.yaml
 ### Running locally
 
 The Dapr CLI will automatically create a directory named `components` in your current working directory with a Redis component.
-To use Azure Service Bus, replace the contents of `messagebus.yaml` file with the contents of `azuresb.yaml` above (Don't change the filename).
+To use Azure Service Bus, replace the contents of `pubsub.yaml` (or `messagebus.yaml` for Dapr < 0.6.0) file with the contents of `azuresb.yaml` above (Don't change the filename).
diff --git a/howto/setup-pub-sub-message-broker/setup-gcp.md b/howto/setup-pub-sub-message-broker/setup-gcp.md
index 191121de1..a8cb3814d 100644
--- a/howto/setup-pub-sub-message-broker/setup-gcp.md
+++ b/howto/setup-pub-sub-message-broker/setup-gcp.md
@@ -69,4 +69,4 @@ kubectl apply -f messagebus.yaml
 
 ### Running locally
 
-The Dapr CLI will automatically create a directory named `components` in your current working directory. To use Cloud Pubsub, replace the contents of `messagebus.yaml` file with the contents of yaml above.
+The Dapr CLI will automatically create a directory named `components` in your current working directory. To use Cloud Pubsub, replace the contents of `pubsub.yaml` (or `messagebus.yaml` for Dapr < 0.6.0) file with the contents of yaml above.
diff --git a/howto/setup-pub-sub-message-broker/setup-hazelcast.md b/howto/setup-pub-sub-message-broker/setup-hazelcast.md
index 1f4562efd..bca308fdc 100644
--- a/howto/setup-pub-sub-message-broker/setup-hazelcast.md
+++ b/howto/setup-pub-sub-message-broker/setup-hazelcast.md
@@ -48,4 +48,4 @@ kubectl apply -f hazelcast.yaml
 ### Running locally
 
 The Dapr CLI will automatically create a directory named `components` in your current working directory with a Redis component.
-To use Hazelcast, replace the redis.yaml file with the hazelcast.yaml above.
+To use Hazelcast, replace the `pubsub.yaml` (or `messagebus.yaml` for Dapr < 0.6.0) file with the hazelcast.yaml above.
diff --git a/howto/setup-pub-sub-message-broker/setup-nats.md b/howto/setup-pub-sub-message-broker/setup-nats.md
index 312e38091..c69ec4554 100644
--- a/howto/setup-pub-sub-message-broker/setup-nats.md
+++ b/howto/setup-pub-sub-message-broker/setup-nats.md
@@ -58,4 +58,4 @@ kubectl apply -f nats.yaml
 ### Running locally
 
 The Dapr CLI will automatically create a directory named `components` in your current working directory with a Redis component.
-To use NATS, replace the contents of `messagebus.yaml` file with the contents of `nats.yaml` above (Don't change the filename).
+To use NATS, replace the contents of `pubsub.yaml` (or `messagebus.yaml` for Dapr < 0.6.0) file with the contents of `nats.yaml` above (Don't change the filename).
diff --git a/howto/setup-pub-sub-message-broker/setup-rabbitmq.md b/howto/setup-pub-sub-message-broker/setup-rabbitmq.md
index 9134b9d99..b3330d374 100644
--- a/howto/setup-pub-sub-message-broker/setup-rabbitmq.md
+++ b/howto/setup-pub-sub-message-broker/setup-rabbitmq.md
@@ -72,4 +72,4 @@ kubectl apply -f rabbitmq.yaml
 ### Running locally
 
 The Dapr CLI will automatically create a directory named `components` in your current working directory with a Redis component.
-To use RabbitMQ, replace the contents of `messagebus.yaml` file with the contents of `rabbitmq.yaml` above (Don't change the filename).
+To use RabbitMQ, replace the contents of `pubsub.yaml` (or `messagebus.yaml` for Dapr < 0.6.0) file with the contents of `rabbitmq.yaml` above (Don't change the filename).
diff --git a/reference/specs/bindings/storagequeues.md b/reference/specs/bindings/storagequeues.md
index bc403d8f5..8547ccad2 100644
--- a/reference/specs/bindings/storagequeues.md
+++ b/reference/specs/bindings/storagequeues.md
@@ -15,7 +15,7 @@ spec:
   - name: queue
     value: "myqueue"
   - name: ttlInSeconds
-    value: 60
+    value: "60"
 ```
 
 - `storageAccount` is the Azure Storage account name.