Added changes brought up in PR discussion.

Signed-off-by: Hollie Teal <hollie@docker.com>