Borer, plantman and Heist fixes.