Updates to review comments