Fix broken specs

Test Plan:
Ran specs, they all pass