More mercenary fixes.