* Some minor changes