[DF-185] Fixed linker issues