review fixes part 2

Auditors: nsanch