Fix dependencies and failing specs.