Some minor issues changes