[ignore_release] Fixing builds after changes in core