Minor fixes.
Minor changes