Fix NPE, up default branching factor