Fixed Branching issues