Minor bug fixes to workflow routines.