few fixes to mercenary