Fix function predicates