Updates based on rblue comments.