Branching style fixes