Some Execution fixes
Merge pull request #1007 from twitter/execution-fixes

Some Execution fixes