Minor changes to pass W3C HTML validation