Merging minor changes.