Some minor fixes and optimizations of DriverManagerDataSource.