LPS-49294 DriverImpls

Here are the fixes two the last two files that you were having trouble with - logic hasn't changed a all, we just have to be more careful how we initialize everything because of the static block and final.