[DF-1131] Fixed linker errors