Misc driver improvements