Allele-specific fixes, should be now ready