Fix a few failing specs.