fix some stuff related to enable-barriers