Some fixes to FixedBarrier.