Fixes to Genotype stuff