Tweaks from HTML validation