Salaries in cost table, small fixes