Minor fixes and changes.
Minor.