Spark-safe barriers

Spark-safe barriers