Fixing markup?