Add fixes from Ensembl