Tweaks for conditional branching