Tasks and conditions bugs corrections