Fix Derived data collect bugs