Minor changes to refine workflow.