Hotfix for trade and tribute specs

Various minor fixes, plus a fix for trade/tribute not being specified correctly in campaign missions