Fix a couple of bugs as found in review.

Auditors: chris

Test Plan:
Fingers crossed