Some changes to make HTML5 validator happy