Adoption fixes