Fixed some problems with certain workflows