Feature/workflow overdue fixes

The same way.  I was applauding your efforts. :)