Cyclic Barrier problem fixes and stuff