Some adaptations due to internal Intrusive changes.