Updates from PR.