Minor bug fixes and changes

Fix ShouldRun for default result types outside of branches