Some more mods for SAF filtering