Bug fixes and harmonizations with interval_adapt.