More borer fixes.
Merge pull request #1886 from N3X15/fix-borers

More borer fixes.