Address minor review concerns