Minor fixes for filters