more barrier fixes