Bug fixes.
More adjustments.