Some minor adoptions