Fix errors caught from markup validator