Incorporated fixes for driver code review comments.