[TASK] Compatibility to recent core changes

Fixes #4