Continue tweaking flags for branching