Fix 2 problems with create workflow