Address minor pull request concerns