Minor changes

Some minor changes