Update for post-commit review comments