Some modification to produce valid HTML