Some minor changed