Correct issues causing driver to crash.