Fixed PR comments.
More PR fixes