Adding changes supporting PR comments.