Minor driver cleanup