Minor fixes for filter bugs