More markup corrections for better validation.