Minor changes before merging.
PR comments.