diff --git a/src/General/BuildTest.coffee b/src/General/BuildTest.coffee
index bdba5235a..271f44d5b 100644
--- a/src/General/BuildTest.coffee
+++ b/src/General/BuildTest.coffee
@@ -25,18 +25,24 @@ BuildTest =
         if postData.no is post.ID
           root = Build.postFromObject postData, post.board.ID
           post2 = new Post root, post.thread, post.board
-          if post.normalizedHTML is post2.normalizedHTML
+          if post.normalizedOriginal.isEqualNode post2.normalizedOriginal
             c.log "#{post.fullID} correct"
           else
             c.log "#{post.fullID} differs"
-            i = 0
-            while i < post.normalizedHTML.length and i < post2.normalizedHTML.length
-              break unless post.normalizedHTML[i] is post2.normalizedHTML[i]
-              i++
-            c.log post.normalizedHTML[i..i+80]
-            c.log post2.normalizedHTML[i..i+80]
-            c.log post.normalizedHTML
-            c.log post2.normalizedHTML
+            html = post.normalizedOriginal.innerHTML
+            html2 = post2.normalizedOriginal.innerHTML
+            if html is html2
+              c.log post.normalizedOriginal.outerHTML
+              c.log post2.normalizedOriginal.outerHTML
+            else
+              i = 0
+              while i < html.length and i < html2.length
+                break unless html[i] is html2[i]
+                i++
+              c.log html[i..i+80]
+              c.log html2[i..i+80]
+              c.log html
+              c.log html2
           post2.isFetchedQuote = true
           Main.callbackNodes Post, [post2]
 
@@ -45,5 +51,5 @@ BuildTest =
 
   testAll: ->
     g.posts.forEach (post) ->
-      unless post.isClone or post.isFetchedQuote
+      unless post.isClone or post.isFetchedQuote or $ '.abbr', post.nodes.comment
         BuildTest.runTest post
diff --git a/src/General/lib/post.class b/src/General/lib/post.class
index 897e18de0..912a2be6c 100755
--- a/src/General/lib/post.class
+++ b/src/General/lib/post.class
@@ -10,9 +10,11 @@ class Post
       href = el.href
       href = href.replace /(^\w+:\/\/boards.4chan.org\/[^\/]+\/thread\/\d+)\/.*/, '$1'
       el.setAttribute 'href', href
+    for el in $$ 'a[rel=canonical]', root2
+      el.removeAttribute 'rel'
     for el in $$ 'img[src]', root2
       el.src = el.src.replace /^(\w+:\/\/)[0-2](\.t\.4cdn\.org\/)/, '$10$2'
-    @normalizedHTML = root2.outerHTML
+    @normalizedOriginal = root2
 
     @ID     = +root.id[2..]
     @fullID = "#{@board}.#{@ID}"