More borer stuff fixes