Some minor changes!