Bug fix.
Minor changes.