Fixed more warnings to do with new filtering layer.