Ref #3484: Make some corrections for workflow