Null driver fixes