Alisha commit: Minor ClientDriver things.