Review fixes

Test Plan:
make test

Auditors: jack