Added changes from vendor comments.