Address another round of review comments