Small things to remove echos in workflow, etc.