Address concerns from PR