More fixes to attempt fixing random setting always activating new tasks if one is already in progress.