Address various comments by 96187