Bug fixes. Minor changes.