Address pr comments.