FIX bugs found in report system