Filtering updates, warning fixes