Address a first round of review comments