PLINK-130 fix compiler, checkstyle errors