Fix for W3 Errors.