Fixed W3 errors