Some fixes as per W3C