[TASK] Several fixes in workflow handling