Fixes a bunch of broken specs.