Fix subtle throttling issue in Runner
Cleanup