Fixed HTML 5 validation issues here too