Fixes to the border crawlers.