Tweaks for W3C compliance