Taking care of this and the driver version addition in #176.