Small changes for reduce diferences with GG branch.