Another round of review fixes