2.3 layout fixes

A couple of small problems seen while testing sampler