Some minor changes related with bug after Merge