Final conditional batch actions fixes