Checkin of some review comments.