Made changes to ease workflow migration issues