BeamBolt adjustments from code review.