various fixes
Merge remote-tracking branch 'NCH/proto/workflows' into proto/workflows