Some minor fixes to filters