Fix W3 complaints