Bug fixes. Small changes.