Fix for the layout run failure

And a couple of other hints, for a good measure.