Fixed Payroll

Fixed issues with payroll