TRQ-2803: fixed more linkage errors.