Address minor issues