Changes WRT review comments.