Some fixes for bug #8369.  The payroll report had to get fixed.