Some minor cahnages