Updates from driver code review.
More driver code review updates.