After merge, some minor issues