Second round of review fixes