Bug fixes.
Minor changes.