Some minor changes in code.