Fixing markup issues.