Address minor review comments