salary: various fixes...