Fixed a bunch of failing specs