[TIDOC-1898] Fix linking issues