Updates following legal review