More driver improvements