More fixes to barrier.