Several updates for reporting