PLINK-130 fix compile, checkstyle errors