Latest changes in gwas fixes branch