Fix a bunch of specs