Little corrections of previous merge