Driver page fixes