[PLINK-130] - Fixing compiling errors. Still need to review the tests.