Fixes for notice, payslip and extra