Tweaks to handle ~M SNPs