Minor adoptions to force rebuild