Address minor comments