Bug fixes. Minor changes.
Minor changes