Fixes for the W3C validator