Few more minor changes.