Address minor issues and improvments