Fixing markup errors