Fix a couple of issues from WooRank