Some minor  changes