Compat changes to reflect the changes of merging the filters into the core.