Borer fixes and tweaks.