Minor fixes for legacy driver support