Fix some copy-pasta bugs.

Auditors: chris

Test plan:
Run this manually on the sandcastle machine.