Bugfixes on Genotype