Fix branching build errors