More borer fixes.