Updates from review comments