Merge pull request #2587 from wpaulino/anchors-fee-fixes