Tweaks to meet markup validation