Fixes to resuming pipeline conditions