Updates from PR feedback