Various Workflow fixes

b/17004643
b/16978526
b/16907125
b/16977228