Duplicate reports fixes